diff --git a/crm-admin/src/main/java/com/yb/lb/webapp/utils/RoleDateUtils.java b/crm-admin/src/main/java/com/yb/lb/webapp/utils/RoleDateUtils.java index af4aff7..5e34900 100644 --- a/crm-admin/src/main/java/com/yb/lb/webapp/utils/RoleDateUtils.java +++ b/crm-admin/src/main/java/com/yb/lb/webapp/utils/RoleDateUtils.java @@ -106,13 +106,13 @@ public class RoleDateUtils { */ public Map findSerMap(String region, String areaId, String areaId1, String archivesId, String userId, String code, String type, String companyId) { Map info = new HashMap<>(); - if (region != null && !region.equals("")) { + if (region != null && !"".equals(region)) { info.put("region", region); info.put("flag", "5"); info.put("companyId", companyId); info.put("code", "1"); } else { - if (areaId != null && !areaId.equals("")) { + if (areaId != null && !"".equals(areaId)) { //获取行政区域范围 Map areaMap = redisService.hmget(archivesId + ":ave"); //如果是组合权限 @@ -158,7 +158,7 @@ public class RoleDateUtils { case "3": if (areaMap.size() > 0) { String adcode = areaMap.get("adcode") + ""; - info.put("adcodes", adcode.split(",")); + info.put("adcodes", adcode.split(",", -1)); info.put("flag", "5"); info.put("companyId", companyId); info.put("code", "1"); diff --git a/crm-webapp/src/main/java/com/yb/lb/webapp/archives/plantuser/service/PotentialClientService.java b/crm-webapp/src/main/java/com/yb/lb/webapp/archives/plantuser/service/PotentialClientService.java index 3ce3cae..850f1c2 100644 --- a/crm-webapp/src/main/java/com/yb/lb/webapp/archives/plantuser/service/PotentialClientService.java +++ b/crm-webapp/src/main/java/com/yb/lb/webapp/archives/plantuser/service/PotentialClientService.java @@ -126,7 +126,7 @@ public class PotentialClientService { // 回写金额 Map params1 = new HashMap<>(); params1.put("id", uuid); - params1.put("amount", amount); + params1.put("amount", String.valueOf(amount)); this.update(params1, ".updateCrmPotentialClient"); } return true; diff --git a/crm-webapp/src/main/java/com/yb/lb/webapp/system/authority/thread/RoleThread.java b/crm-webapp/src/main/java/com/yb/lb/webapp/system/authority/thread/RoleThread.java index f2cca6c..bea1594 100644 --- a/crm-webapp/src/main/java/com/yb/lb/webapp/system/authority/thread/RoleThread.java +++ b/crm-webapp/src/main/java/com/yb/lb/webapp/system/authority/thread/RoleThread.java @@ -158,10 +158,18 @@ public class RoleThread implements Runnable { Map info = new HashMap<>(); if (!archivesId.isEmpty()) { info.put("staffId", archivesId); - Map aveMap = roleAreaService.oneByAve(info, ".findById"); - if (aveMap != null) { + // Map aveMap = roleAreaService.oneByAve(info, ".findById"); + List regionList = roleAreaService.findArea(info, ".findById"); + if (regionList != null && regionList.size() > 0) { redisService.del(archivesId + ":ave"); + String[] arr = new String[regionList.size()]; + for (int i = 0; i < regionList.size(); i++) { + Map map = regionList.get(i); + arr[i] = map.get("adcode") + ""; + } + Map aveMap = new HashMap(); aveMap.put("areaId", areaId); + aveMap.put("adcode", String.join(",", arr)); redisService.hmset(archivesId + ":ave", aveMap); } else { //判断key值是否在数据库中存在