部门关联修改

crmeb-admin/src/main/java/com/zbkj/admin/controller/merchant/NewMerchantApi.java

@@ -350,8 +350,12 @@ public class NewMerchantApi {
         for (MerchantSmsTemplate merchantSmsTemplate : list) {
             String tempId = merchantSmsTemplate.getTempId();
             MerchantSmsTiming merchantSmsTiming = merchantSmsTimingService.selectByTempId(tempId);
-            Integer isStatus = merchantSmsTiming.getIsStatus();
-            merchantSmsTemplate.setIsStatus(isStatus);
+            if (null != merchantSmsTiming) {
+                Integer isStatus = merchantSmsTiming.getIsStatus();
+                if (null != isStatus) {
+                    merchantSmsTemplate.setIsStatus(isStatus);
+                }
+            }
             merchantSmsTemplateService.updateById(merchantSmsTemplate);
         }
 
@@ -548,7 +552,7 @@ public class NewMerchantApi {
 
     @ApiOperation(value = "获取定时任务信息")
     @RequestMapping(value = "/getTaskMessage", method = RequestMethod.POST)
-    public CommonResult<MerchantSmsTiming> getTaskMessage( @RequestParam(value = "tempId", required = false) String tempId) {
+    public CommonResult<MerchantSmsTiming> getTaskMessage(@RequestParam(value = "tempId", required = false) String tempId) {
         MerchantSmsTiming merchantSmsTiming = merchantSmsTimingService.selectByTempId(tempId);
 
         return CommonResult.success(merchantSmsTiming);

crmeb-admin/src/main/java/com/zbkj/admin/controller/platform/NewPlatformApi.java

@@ -166,8 +166,7 @@ public class NewPlatformApi {
             String organizationId = userEnterprise.getOrganizationId();
             Organization organization = organizationService.getById(organizationId);
             userEnterprise.setEnterpriseName(organization.getName());
-            OrganizationDepartment organizationDepartment = organizationDepartmentService.getById(userEnterprise.getDepartment());
-            userEnterprise.setDepartment(organizationDepartment.getName());
+            userEnterprise.setDepartment(userEnterprise.getDepartment());
             OrganizationDepartmentUser organizationDepartmentUser = organizationDepartmentUserService.getById(userEnterprise.getRealName());
             userEnterprise.setRealName(organizationDepartmentUser.getName());
             userEnterprise.setIsAuthentication(1);
@@ -244,7 +243,7 @@ public class NewPlatformApi {
             userBypassAccount.setId(byId.getId());
             userBypassAccount.setCreateTime(new Date());
             userBypassAccount.setIsDelete(0);
-            userBypassAccount.setDepartmentId(userBypassAccount.getDepartment());
+            userBypassAccount.setDepartmentId(userBypassAccount.getDepartmentId());
             String realName = userBypassAccount.getRealName();
             userBypassAccount.setRealName(realName);
             String department = userBypassAccount.getDepartment();
@@ -426,16 +425,16 @@ public class NewPlatformApi {
             BigDecimal a = byId.getLineOfCredit();//总信用额度
             BigDecimal b = byId.getAvailableLineOfCredit();//可用信用额度
 
-            BigDecimal bb = b.add(setLineOfCreditRequest.getLineOfCredit());//可用信用额度 加 要恢复的信用额度
-
-            BigDecimal aa = a.add(setLineOfCreditRequest.getLineOfCredit());
+//            BigDecimal bb = b.add(setLineOfCreditRequest.getLineOfCredit());//可用信用额度 加 要恢复的信用额度
+//
+//            BigDecimal aa = a.add(setLineOfCreditRequest.getLineOfCredit());
 
 
             //调整后的可用额度和总额度
             UserEnterprise userEnterprise = new UserEnterprise();
             userEnterprise.setId(setLineOfCreditRequest.getId());
-            userEnterprise.setLineOfCredit(aa);
-            userEnterprise.setAvailableLineOfCredit(bb);
+            userEnterprise.setLineOfCredit(setLineOfCreditRequest.getLineOfCredit());
+            userEnterprise.setAvailableLineOfCredit(setLineOfCreditRequest.getLineOfCredit());
             userEnterpriseService.updateById(userEnterprise);
             //信用额度记录
             UserEnterpriseRecord userEnterpriseRecord = new UserEnterpriseRecord();
@@ -444,7 +443,7 @@ public class NewPlatformApi {
             userEnterpriseRecord.setLinkType("system");
             userEnterpriseRecord.setType(1);
             userEnterpriseRecord.setAmount(setLineOfCreditRequest.getLineOfCredit());
-            userEnterpriseRecord.setBalance(bb);
+            userEnterpriseRecord.setBalance(setLineOfCreditRequest.getLineOfCredit());
             userEnterpriseRecord.setRemark(StrUtil.format("调整信用额度成功,调整增加信用额度{}元",
                     setLineOfCreditRequest.getLineOfCredit()));
             userEnterpriseRecordService.save(userEnterpriseRecord);
@@ -668,7 +667,7 @@ public class NewPlatformApi {
     @ApiOperation(value = "平台端用户列表")
     @RequestMapping(value = "/otganizatonDepartmentUserList", method = RequestMethod.GET)
     public CommonResult<?> otganizatonDepartmentlist(@RequestParam(name = "id", required = true) String id,
-                                                     @RequestParam(name = "organizationId", required = true) String organizationId
+                                                     @RequestParam(name = "organizationId", required = false) String organizationId
     ) {
         ArrayList<OrganizationDepartmentUser> organizationDepartmentUsers = new ArrayList<>();
         LambdaQueryWrapper<OrganizationDepartment> queryWrapper = new LambdaQueryWrapper<>();
@@ -724,9 +723,8 @@ public class NewPlatformApi {
     @ApiOperation(value = "平台端组织机构编辑-用户")
     @RequestMapping(value = "/organizationUserEdit", method = RequestMethod.POST)
     public CommonResult<String> organizationUserEdit(@RequestBody @Validated OrganizationDepartmentUser request) {
-        String username = request.getName();
         LambdaQueryWrapper<UserBypassAccount> userBypassAccountLambdaQueryWrapper = new LambdaQueryWrapper<>();
-        userBypassAccountLambdaQueryWrapper.eq(UserBypassAccount::getRealName, username);
+        userBypassAccountLambdaQueryWrapper.eq(UserBypassAccount::getDepartmentId, request.getDepartmentId());
         List<UserBypassAccount> list = userBypassAccountService.list(userBypassAccountLambdaQueryWrapper);
         if (null != list && list.size() > 0) {
             for (UserBypassAccount userBypassAccount : list) {
@@ -735,6 +733,24 @@ public class NewPlatformApi {
                 userBypassAccountService.updateById(userBypassAccount);
             }
         }
+        LambdaQueryWrapper<UserEnterprise> enterpriseLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        enterpriseLambdaQueryWrapper.eq(UserEnterprise::getOrganizationId, request.getOrganizationId());
+        OrganizationDepartment organizationDepartment = organizationDepartmentService.getById(request.getDepartmentId());
+        if (null!=organizationDepartment){
+            String name1 = organizationDepartment.getName();
+            enterpriseLambdaQueryWrapper.eq(UserEnterprise::getDepartment, name1);
+            List<UserEnterprise> userEnterprises = userEnterpriseService.list(enterpriseLambdaQueryWrapper);
+            if (null != userEnterprises && userEnterprises.size() > 0) {
+                for (UserEnterprise userEnterprise : userEnterprises) {
+
+                    String name = request.getName();
+                    userEnterprise.setRealName(name);
+                    userEnterpriseService.updateById(userEnterprise);
+                }
+            }
+        }
+
+
         organizationDepartmentUserService.updateById(request);
         return CommonResult.success("操作成功");
     }

crmeb-service/src/main/java/com/zbkj/service/service/impl/OrganizationDepartmentServiceImpl.java

@@ -16,6 +16,7 @@ import com.zbkj.service.dao.UserEnterpriseDao;
 import com.zbkj.service.service.OrganizationDepartmentService;
 
 import com.zbkj.service.service.UserBypassAccountService;
+import com.zbkj.service.service.UserEnterpriseService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -33,6 +34,8 @@ public class OrganizationDepartmentServiceImpl extends ServiceImpl<OrganizationD
     private UserEnterpriseDao userEnterpriseDao;
     @Autowired
     private UserBypassAccountService userBypassAccountService;
+    @Autowired
+    private UserEnterpriseService userEnterpriseService;
 
     @Override
     public List<OrganizationDepartmentVO> selectMain(String id) {
@@ -52,9 +55,18 @@ public class OrganizationDepartmentServiceImpl extends ServiceImpl<OrganizationD
         LambdaQueryWrapper<UserBypassAccount> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(UserBypassAccount::getDepartmentId,id);
         UserBypassAccount userBypassAccount = userBypassAccountService.getOne(queryWrapper);
-        userBypassAccount.setDepartment(request.getName());
-        userBypassAccountService.updateById(userBypassAccount);
-
+        if (null!=userBypassAccount){
+            userBypassAccount.setDepartment(request.getName());
+            userBypassAccountService.updateById(userBypassAccount);
+        }
+
+        LambdaQueryWrapper<UserEnterprise> enterpriseLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        enterpriseLambdaQueryWrapper.eq(UserEnterprise::getOrganizationId,request.getOrganizationId());
+        UserEnterprise userEnterprise = userEnterpriseService.getOne(enterpriseLambdaQueryWrapper);
+        if (null!=userEnterprise){
+            userEnterprise.setDepartment(request.getName());
+            userEnterpriseService.updateById(userEnterprise);
+        }
     }
 }