|
@@ -189,6 +189,8 @@ public class OkkiSiteServiceImpl extends ServiceImpl<OkkiSiteMapper, OkkiSite> i
|
|
|
* @param key
|
|
|
*/
|
|
|
public void setApiOkkiSiteUserStr(OkkiSite item, Map<String, Object> mergedList, String key) {
|
|
|
+// String init = "{\"1\":[],\"2\":[],\"3\":[],\"4\":[],\"5\":[],\"6\":[],\"7\":[],\"8\":[],\"9\":[],\"10\":[],\"11\":[],\"12\":[]}";
|
|
|
+// mergedList = FastJsonUtil.parseObject(init,Map.class);
|
|
|
Object object = mergedList.get(key);
|
|
|
if (object != null) {
|
|
|
// log.info("serviceManageUsers (key={}): {}", key, FastJsonUtil.toJSONString(object));
|
|
@@ -212,6 +214,20 @@ public class OkkiSiteServiceImpl extends ServiceImpl<OkkiSiteMapper, OkkiSite> i
|
|
|
.map(OkkiUserInfoDto::getUserId)
|
|
|
.collect(Collectors.toList());
|
|
|
|
|
|
+ //默认人员
|
|
|
+ Map<String, List<Integer>> defaultUserIds = new HashMap<>();
|
|
|
+ defaultUserIds.put("1", Arrays.asList(1294, 1297));
|
|
|
+ defaultUserIds.put("2", Collections.singletonList(1230));
|
|
|
+ defaultUserIds.put("7", Arrays.asList(1293, 1412, 1511, 1541));
|
|
|
+ defaultUserIds.put("9", Collections.singletonList(1415));
|
|
|
+ defaultUserIds.put("10", Collections.singletonList(1543));
|
|
|
+ defaultUserIds.put("4", Collections.singletonList(1290));
|
|
|
+ defaultUserIds.put("8", Collections.singletonList(1593));
|
|
|
+ defaultUserIds.put("12", Collections.singletonList(1409));
|
|
|
+ if (userIds.isEmpty() && defaultUserIds.containsKey(key)) {
|
|
|
+ userIds.addAll(defaultUserIds.get(key));
|
|
|
+ }
|
|
|
+
|
|
|
// 根据 key 设置不同的字段
|
|
|
switch (key) {
|
|
|
case "1":
|