diff --git a/yifu-common/yifu-common-dapr/src/main/java/com/yifu/cloud/plus/v1/yifu/common/dapr/util/UpmsDaprUtils.java b/yifu-common/yifu-common-dapr/src/main/java/com/yifu/cloud/plus/v1/yifu/common/dapr/util/UpmsDaprUtils.java index 5f19d9fd114b05576715dbb7b47d1e37b320536a..132459124bfc9b6be78bc416f5a830924aace47d 100644 --- a/yifu-common/yifu-common-dapr/src/main/java/com/yifu/cloud/plus/v1/yifu/common/dapr/util/UpmsDaprUtils.java +++ b/yifu-common/yifu-common-dapr/src/main/java/com/yifu/cloud/plus/v1/yifu/common/dapr/util/UpmsDaprUtils.java @@ -126,7 +126,7 @@ public class UpmsDaprUtils { * @Param * @return **/ - public R<Boolean> selectExitDeptCompany(String deptName) { - return HttpDaprUtil.invokeMethodPost(daprUpmsProperties.getAppUrl(),daprUpmsProperties.getAppId(),"/user/inner/selectExitDeptCompany", deptName, Boolean.class, SecurityConstants.FROM_IN); + public R<Boolean> selectExitDeptCompany(String deptId) { + return HttpDaprUtil.invokeMethodPost(daprUpmsProperties.getAppUrl(),daprUpmsProperties.getAppId(),"/user/inner/selectExitDeptCompany", deptId, Boolean.class, SecurityConstants.FROM_IN); } } diff --git a/yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TInsuranceUnpurchaseApplyServiceImpl.java b/yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TInsuranceUnpurchaseApplyServiceImpl.java index 0b9be3632d21f874db88a812c33c3ba0c20cd1b9..3516479bcf198a35ceaf8140df53fc57a417d4fd 100644 --- a/yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TInsuranceUnpurchaseApplyServiceImpl.java +++ b/yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TInsuranceUnpurchaseApplyServiceImpl.java @@ -416,9 +416,9 @@ public class TInsuranceUnpurchaseApplyServiceImpl extends ServiceImpl<TInsurance //申请人是å¦å±žäºŽå分公å¸å’Œè¯¥é¡¹ç›®æ˜¯å¦æœ‰å®¡æ‰¹é€šè¿‡è®°å½•èµ‹å€¼ private void setValue(TInsuranceUnpurchaseApply tInsuranceUnpurchaseApply,YifuUser user) { if (Common.isNotNull(tInsuranceUnpurchaseApply.getDeptNo())) { - String deptName = user.getDeptName(); + String deptId = user.getDeptId().toString(); - R<Boolean> booleanR = upmsDaprUtils.selectExitDeptCompany(deptName); + R<Boolean> booleanR = upmsDaprUtils.selectExitDeptCompany(deptId); if (Common.isEmpty(booleanR) || Boolean.FALSE.equals(booleanR.getData())) { tInsuranceUnpurchaseApply.setCompanyFlag(CommonConstants.ONE_STRING); } else { diff --git a/yifu-upms/yifu-upms-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/admin/controller/UserController.java b/yifu-upms/yifu-upms-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/admin/controller/UserController.java index fad5add949eeff1e39dd1ce6fb19bc6dafc13f47..9d28a3f50983330e59195683be8a2851c00be47b 100644 --- a/yifu-upms/yifu-upms-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/admin/controller/UserController.java +++ b/yifu-upms/yifu-upms-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/admin/controller/UserController.java @@ -620,7 +620,7 @@ public class UserController { @Inner @PostMapping(value = {"/inner/selectExitDeptCompany"}) - public Boolean selectExitDeptCompany(@RequestBody String deptName) { - return userService.selectExitDeptCompany(deptName); + public Boolean selectExitDeptCompany(@RequestBody String deptId) { + return userService.selectExitDeptCompany(deptId); } } diff --git a/yifu-upms/yifu-upms-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/admin/mapper/SysUserMapper.java b/yifu-upms/yifu-upms-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/admin/mapper/SysUserMapper.java index 6d1cbcf1df21397ffbb40c49bfc4a3fb1b9309a3..b722d0d6f5f9745efb2a80b887e463ecc4fcb4ed 100644 --- a/yifu-upms/yifu-upms-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/admin/mapper/SysUserMapper.java +++ b/yifu-upms/yifu-upms-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/admin/mapper/SysUserMapper.java @@ -82,5 +82,5 @@ public interface SysUserMapper extends BaseMapper<SysUser> { List<SysUser> getUserManagerByUpDepartIdUp(@Param("departId") Integer departId, @Param("roleId")String roleId); - String selectExitDeptCompany(@Param("deptName") String deptName); + String selectExitDeptCompany(@Param("deptId") String deptId); } diff --git a/yifu-upms/yifu-upms-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/admin/service/SysUserService.java b/yifu-upms/yifu-upms-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/admin/service/SysUserService.java index b94d17f405060b14d61b33e5d37a2a409c01b73b..0db51abe1b066dbba9b637ba10ec00a0e72319fa 100644 --- a/yifu-upms/yifu-upms-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/admin/service/SysUserService.java +++ b/yifu-upms/yifu-upms-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/admin/service/SysUserService.java @@ -190,6 +190,6 @@ public interface SysUserService extends IService<SysUser> { List<SysUser> getUserManagerByUpDepartIdUp(Integer departId, String roleId); - Boolean selectExitDeptCompany(String deptName); + Boolean selectExitDeptCompany(String deptId); } diff --git a/yifu-upms/yifu-upms-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/admin/service/impl/SysUserServiceImpl.java b/yifu-upms/yifu-upms-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/admin/service/impl/SysUserServiceImpl.java index 8a9509c760301d0b733486121cc0dca428ddf155..80d65e151a301fc623e27fa1e63908d0c0d1faa5 100644 --- a/yifu-upms/yifu-upms-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/admin/service/impl/SysUserServiceImpl.java +++ b/yifu-upms/yifu-upms-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/admin/service/impl/SysUserServiceImpl.java @@ -953,8 +953,8 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl } @Override - public Boolean selectExitDeptCompany(String deptName) { - String dn = baseMapper.selectExitDeptCompany(deptName); + public Boolean selectExitDeptCompany(String deptId) { + String dn = baseMapper.selectExitDeptCompany(deptId); if (Common.isEmpty(dn)) { return false; } diff --git a/yifu-upms/yifu-upms-biz/src/main/resources/mapper/SysUserMapper.xml b/yifu-upms/yifu-upms-biz/src/main/resources/mapper/SysUserMapper.xml index ca0f2df2e55d658d2fc2229bac376af359bbade8..b6c4fa26190408002ae7f2bc235a5194aabe4d0e 100644 --- a/yifu-upms/yifu-upms-biz/src/main/resources/mapper/SysUserMapper.xml +++ b/yifu-upms/yifu-upms-biz/src/main/resources/mapper/SysUserMapper.xml @@ -384,6 +384,6 @@ SELECT dept_dn from - sys_dept where name = #{deptName} limit 1 + sys_dept where dept_id = #{deptId} limit 1 </select> </mapper>