监理分包商bug

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

@@ -114,6 +114,11 @@ public class ZhcxSubcontractorUserServiceImpl extends BaseServiceImpl<ZhcxSubcon
         //Map<String, Object> params = new HashMap<>(5);
         //params.put("userid", userId);
         //zhcxSubcontractorUserDao.deleteUserRole(params);
+        List<String> rids = sysUser.getRids();
+        UpdateWrapper<SysUserRoleDo> wrapper = new UpdateWrapper<SysUserRoleDo>();
+        wrapper.eq("USERID", userId);
+        wrapper.in("ROLEID", rids);
+        sysUserRoleService.remove(wrapper);
         SysUserRoleDo sysUserRoleDo = new SysUserRoleDo();
         sysUserRoleDo.setUserid(userId);
         if (StringUtils.isBlank(sysUser.getRoleid())) {

business-entity/src/main/java/com/rongwei/bsentity/vo/SubContractorBySysUserVo.java

@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.List;
 
 @Data
 @JsonIgnoreProperties(ignoreUnknown = true)
@@ -14,4 +15,6 @@ public class SubContractorBySysUserVo extends SysUserDo implements Serializable
     private String roleid;
     @ApiModelProperty("监理id")
     private String supervisorId;
+
+    private List<String> rids;
 }