|
@@ -578,10 +578,10 @@ public class MESHelperServiceImpl implements MESHelperService {
|
|
|
private Map<Object,Object> GetMaster(JSONObject map){
|
|
|
//实际业务数据
|
|
|
Map<Object, Object> rmap = new HashMap<>();
|
|
|
- SqlRowList rs=baseDao.queryForRowSet("select ma_user from mes.master");
|
|
|
+ SqlRowList rs=baseDao.queryForRowSet("select ma_user,AE_KEY,AE_SECRET from mes.master left join MES.APIEMPLOYEE B on ma_user=ae_master");
|
|
|
while(rs.next())
|
|
|
{
|
|
|
- rmap.put(rs.getString("ma_user"),rs.getString("ma_user"));
|
|
|
+ rmap.put(rs.getString("ma_user"),rs.getString("AE_KEY")+"|"+rs.getString("AE_SECRET"));
|
|
|
}
|
|
|
return rmap;
|
|
|
}
|