分包商账号及监理账号二开

business-common/src/main/java/com/rongwei/bscommon/sys/dao/ZhcxSubcontractorUserDao.java

@@ -5,12 +5,14 @@ import com.rongwei.rwadmincommon.system.domain.SysUserRoleDo;
 import com.rongwei.rwcommon.base.BaseDao;
 import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Insert;
+import org.apache.ibatis.annotations.Mapper;
 
 import java.util.Map;
 
 /**
  * @author zhuang
  */
+@Mapper
 public interface ZhcxSubcontractorUserDao extends BaseDao<SysUserDo> {
 
     @Delete("DELETE FROM INCONTROL.SYS_USER_ROLE WHERE USERID = #{userid}")

business-common/src/main/java/com/rongwei/bscommon/sys/service/ZhcxSubcontractorUserService.java

@@ -16,5 +16,5 @@ public interface ZhcxSubcontractorUserService extends IService<SysUserDo> {
 
     void batchSaveList(SubcontractorUserVo subcontractorUserVo);
 
-    R saveOrUpdate(SubContractorBySysUserVo sysUser, SysUserVo currUser, String roleid);
+    R saveOrUpdate(SubContractorBySysUserVo sysUser, SysUserVo currUser, String roleid,String opertionType);
 }

business-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ZhcxSubcontractorUserServiceImpl.java

@@ -59,13 +59,13 @@ public class ZhcxSubcontractorUserServiceImpl extends BaseServiceImpl<ZhcxSubcon
                 String secPas = SecurityUtil.getSaltMd5AndSha(userVo.getPassword(), userVo.getId());
                 userVo.setPassword(secPas);
             }
-            R r = this.saveOrUpdate(userVo,currUser,roleid);
+            R r = this.saveOrUpdate(userVo,currUser,roleid,opertionType);
             SysUserDo user = this.getById(userVo.getId());
         }
     }
 
     @Override
-    public R saveOrUpdate(SubContractorBySysUserVo sysUser, SysUserVo currUser, String roleid) {
+    public R saveOrUpdate(SubContractorBySysUserVo sysUser, SysUserVo currUser, String roleid,String opertionType) {
         log.info("sysUser：" + sysUser);
 
         // 1.保存用户信息
@@ -85,7 +85,7 @@ public class ZhcxSubcontractorUserServiceImpl extends BaseServiceImpl<ZhcxSubcon
         //this.saveUserOrg(sysUser);
 
         // 3.保存用户角色
-        this.saveUserRole(sysUser,currUser,roleid);
+        this.saveUserRole(sysUser,currUser,roleid,opertionType);
 
         return R.ok();
     }
@@ -96,7 +96,7 @@ public class ZhcxSubcontractorUserServiceImpl extends BaseServiceImpl<ZhcxSubcon
      * @param sysUser
      * @param roleid
      */
-    private void saveUserRole(SubContractorBySysUserVo sysUser, SysUserVo currUser, String roleid) {
+    private void saveUserRole(SubContractorBySysUserVo sysUser, SysUserVo currUser, String roleid,String opertionType) {
         // 先删除用户原有的角色
         String userId = sysUser.getId();
         Map<String, Object> params = new HashMap<>(5);
@@ -106,11 +106,20 @@ public class ZhcxSubcontractorUserServiceImpl extends BaseServiceImpl<ZhcxSubcon
         sysUserRoleDo.setUserid(userId);
         if (StringUtils.isBlank(sysUser.getRoleid())) {
             sysUserRoleDo.setRoleid(roleid);
+            SaveUserRoles(sysUser, currUser, sysUserRoleDo,opertionType);
         }else{
-            sysUserRoleDo.setRoleid(sysUser.getRoleid());
+            String[] split = sysUser.getRoleid().split(",");
+            for(String splitRoleId : split){
+                sysUserRoleDo.setRoleid(splitRoleId);
+                SaveUserRoles(sysUser, currUser, sysUserRoleDo,opertionType);
+            }
         }
+
+    }
+
+    private void SaveUserRoles(SubContractorBySysUserVo sysUser, SysUserVo currUser, SysUserRoleDo sysUserRoleDo,String opertionType) {
         sysUserRoleDo.setId(SecurityUtil.getUUID());
-        if (StringUtils.isBlank(sysUser.getPassword())) {
+        if ("insert".equals(opertionType)) {
             sysUserRoleDo.setCreatedate(new Date());
             sysUserRoleDo.setCreateuserid(currUser.getId());
             sysUserRoleDo.setCreateusername(currUser.getName());