仓管/财务/老板经销商区分开角色

suishenbang-sync/suishenbang-sync-common/src/main/java/com/dgtly/sync/service/AnalysisDiyCustomerComponent.java

@@ -61,7 +61,12 @@ public class AnalysisDiyCustomerComponent {
     @Autowired
     private IAssRelcustomerinfoService assRelcustomerinfoService;
     private Long deptId;
+    //老板角色
     private Long[] roleIds;
+    //财务
+    private Long[] FinanceRoleIds;
+    //仓管
+    private Long[] HouseRoleIds;
     private Long[] roleGuideIds;
     private Long[] roleCwIds;
     private Long[] roleCwDiyIds;
@@ -78,10 +83,21 @@ public class AnalysisDiyCustomerComponent {
         if(deptId==null){
             deptId = Long.parseLong(configService.selectConfigByKey("libang.customer.deptid"));
         }
+        //老板角色
         if(roleIds==null){
             Long roleId = Long.parseLong(configService.selectConfigByKey("libang.customer.roleid"));
             roleIds = new Long[]{roleId};
         }
+        //财务
+        if(FinanceRoleIds==null){
+            Long roleId = Long.parseLong(configService.selectConfigByKey("libang.customerFinance.roleid"));
+            FinanceRoleIds = new Long[]{roleId};
+        }
+        //仓管
+        if(HouseRoleIds==null){
+            Long roleId = Long.parseLong(configService.selectConfigByKey("libang.customerFinance.roleid"));
+            HouseRoleIds = new Long[]{roleId};
+        }
 
         if (roleGuideIds == null) {
             Long roleId = Long.parseLong(configService.selectConfigByKey("libang.guide.roleid"));
@@ -575,10 +591,13 @@ public class AnalysisDiyCustomerComponent {
                     user.setLoginName(userid);
                     user.setUserName(jo.getString("name"));
                     user.setPhonenumber(jo.getString("mobile"));
-
                     if (isManager == 0) {
                         user.setRoleIds(roleGuideIds);
-                    } else {
+                    }else if(isManager == 2){
+                        user.setRoleIds(FinanceRoleIds);
+                    }else if(isManager == 3){
+                        user.setRoleIds(HouseRoleIds);
+                    }else{
                         user.setRoleIds(roleIds);
                     }
                     user.setPassword(user.getLoginName());
@@ -636,9 +655,15 @@ public class AnalysisDiyCustomerComponent {
 //                        user.setRoleIds(roleIds);
 //                        sysUserService.updateUser(user);
 //                    }
+                        //根据用户id和角色id删除
+
                         if (isManager == 0) {
                             sysUserService.insertUserRole(user.getUserId(), roleGuideIds[0]);
-                        } else {
+                        }else if(isManager == 2){
+                            sysUserService.insertUserRole(user.getUserId(), FinanceRoleIds[0]);
+                        }else if(isManager == 3){
+                            sysUserService.insertUserRole(user.getUserId(), HouseRoleIds[0]);
+                        }else {
                             sysUserService.insertUserRole(user.getUserId(), roleIds[0]);
                         }
                         if (!user.getSysUserExt().getIsCustomerManager().contains(isManager + "") ||