diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoServiceImpl.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoServiceImpl.java index 4d021b51..9c6720c3 100644 --- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoServiceImpl.java +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoServiceImpl.java @@ -19,7 +19,6 @@ import com.yanzhu.manage.mapper.ProProjectInfoDeptsMapper; import com.yanzhu.manage.mapper.ProProjectInfoMapper; import com.yanzhu.manage.mapper.ProProjectInfoSettingMapper; import com.yanzhu.manage.service.IProProjectInfoService; -import com.yanzhu.manage.utils.WxQrCodeUtils; import com.yanzhu.manage.utils.pdf.FileUtil; import com.yanzhu.system.api.RemoteDeptService; import com.yanzhu.system.api.domain.SysDept; diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsGroupServiceImpl.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsGroupServiceImpl.java index 6541d9c5..bb734e73 100644 --- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsGroupServiceImpl.java +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsGroupServiceImpl.java @@ -110,6 +110,8 @@ public class ProProjectInfoSubdeptsGroupServiceImpl implements IProProjectInfoSu // 班组组长信息 if(res>0 && StringUtils.isNotEmpty(proProjectInfoSubdeptsGroup.getGroupLeaderName()) && StringUtils.isNotEmpty(proProjectInfoSubdeptsGroup.getGroupLeaderCode()) && StringUtils.isNotEmpty(proProjectInfoSubdeptsGroup.getGroupLeaderPhone())){ SysUser sysUser = new SysUser(); + sysUser.setComId(info.getComId()); + sysUser.setDeptId(info.getId()); sysUser.setUserName(proProjectInfoSubdeptsGroup.getGroupLeaderPhone()); sysUser.setNickName(proProjectInfoSubdeptsGroup.getGroupLeaderName()); sysUser.setPhonenumber(proProjectInfoSubdeptsGroup.getGroupLeaderPhone()); @@ -195,6 +197,8 @@ public class ProProjectInfoSubdeptsGroupServiceImpl implements IProProjectInfoSu // 班组组长信息 if(res>0 && StringUtils.isNotEmpty(proProjectInfoSubdeptsGroup.getGroupLeaderName()) && StringUtils.isNotEmpty(proProjectInfoSubdeptsGroup.getGroupLeaderCode()) && StringUtils.isNotEmpty(proProjectInfoSubdeptsGroup.getGroupLeaderPhone())){ SysUser sysUser = new SysUser(); + sysUser.setComId(proProjectInfoSubdeptsGroup.getComId()); + sysUser.setDeptId(proProjectInfoSubdeptsGroup.getId()); sysUser.setUserName(proProjectInfoSubdeptsGroup.getGroupLeaderPhone()); sysUser.setNickName(proProjectInfoSubdeptsGroup.getGroupLeaderName()); sysUser.setPhonenumber(proProjectInfoSubdeptsGroup.getGroupLeaderPhone()); @@ -375,6 +379,8 @@ public class ProProjectInfoSubdeptsGroupServiceImpl implements IProProjectInfoSu // 修改用户角色信息 try { SysUser sysUser = new SysUser(); + sysUser.setComId(proProjectInfoSubdeptsUsers.getComId()); + sysUser.setDeptId(proProjectInfoSubdeptsUsers.getProjectId()); sysUser.setUserName(entiry.getGroupLeaderPhone()); sysUser.setUserType(UserTypeEnums.FBBZZZ.getCode()); sysUser.setNickName(entiry.getGroupLeaderName()); diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsServiceImpl.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsServiceImpl.java index 579297fb..cb498e12 100644 --- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsServiceImpl.java +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsServiceImpl.java @@ -111,6 +111,8 @@ public class ProProjectInfoSubdeptsServiceImpl implements IProProjectInfoSubdept // 单位委托人信息 if(StringUtils.isNotEmpty(proProjectInfoSubdepts.getSubDeptLeaderName()) && StringUtils.isNotEmpty(proProjectInfoSubdepts.getSubDeptLeaderCode()) && StringUtils.isNotEmpty(proProjectInfoSubdepts.getSubDeptLeaderPhone())){ SysUser sysUser = new SysUser(); + sysUser.setComId(info.getComId()); + sysUser.setDeptId(info.getId()); sysUser.setUserName(proProjectInfoSubdepts.getSubDeptLeaderPhone()); sysUser.setNickName(proProjectInfoSubdepts.getSubDeptLeaderName()); sysUser.setPhonenumber(proProjectInfoSubdepts.getSubDeptLeaderPhone()); @@ -224,6 +226,8 @@ public class ProProjectInfoSubdeptsServiceImpl implements IProProjectInfoSubdept // 单位委托人信息 if(StringUtils.isNotEmpty(proProjectInfoSubdepts.getSubDeptLeaderName()) && StringUtils.isNotEmpty(proProjectInfoSubdepts.getSubDeptLeaderCode()) && StringUtils.isNotEmpty(proProjectInfoSubdepts.getSubDeptLeaderPhone())){ SysUser sysUser = new SysUser(); + sysUser.setComId(info.getComId()); + sysUser.setDeptId(info.getId()); sysUser.setUserName(proProjectInfoSubdepts.getSubDeptLeaderPhone()); sysUser.setNickName(proProjectInfoSubdepts.getSubDeptLeaderName()); sysUser.setUserType(UserTypeEnums.FBWTDL.getCode()); diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsUsersServiceImpl.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsUsersServiceImpl.java index 03d845ba..82137ad1 100644 --- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsUsersServiceImpl.java +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsUsersServiceImpl.java @@ -132,6 +132,8 @@ public class ProProjectInfoSubdeptsUsersServiceImpl implements IProProjectInfoSu proProjectInfoSubdeptsUsers.setApproveStatus(ApproveStatus.passed.getCode()); SysUser sysUser = new SysUser(); + sysUser.setComId(proProjectInfoSubdeptsUsers.getComId()); + sysUser.setDeptId(proProjectInfoSubdeptsUsers.getProjectId()); sysUser.setUserName(proProjectInfoSubdeptsUsers.getUserPhone()); sysUser.setNickName(proProjectInfoSubdeptsUsers.getUserName()); sysUser.setPhonenumber(proProjectInfoSubdeptsUsers.getUserPhone()); @@ -368,6 +370,8 @@ public class ProProjectInfoSubdeptsUsersServiceImpl implements IProProjectInfoSu } } + sysUser.setComId(proProjectInfoSubdeptsUsers.getComId()); + sysUser.setDeptId(proProjectInfoSubdeptsUsers.getProjectId()); sysUser.setUserName(proProjectInfoSubdeptsUsers.getUserPhone()); sysUser.setNickName(proProjectInfoSubdeptsUsers.getUserName()); sysUser.setPhonenumber(proProjectInfoSubdeptsUsers.getUserPhone()); @@ -530,6 +534,9 @@ public class ProProjectInfoSubdeptsUsersServiceImpl implements IProProjectInfoSu sysUser.setUserType(UserTypeEnums.FBLWRY.getCode()); } } + + sysUser.setComId(proProjectInfoSubdeptsUsers.getComId()); + sysUser.setDeptId(proProjectInfoSubdeptsUsers.getProjectId()); sysUser.setUserName(proProjectInfoSubdeptsUsers.getUserPhone()); sysUser.setNickName(proProjectInfoSubdeptsUsers.getUserName()); sysUser.setPhonenumber(proProjectInfoSubdeptsUsers.getUserPhone());