Merge remote-tracking branch 'origin/master_0929' into master_0929

@@ -120,7 +120,7 @@ public class CustomerCreditController extends DefaultBaseController {
      * 修改
      * 修改
      */
      */
     @ApiOperation("修改")
     @ApiOperation("修改")
-    @HasPermission({"customer-credit-manage:customer-credit-plan:modify"})
+    @HasPermission({"customer-credit-manage:customer-credit-plan:modify","customer-credit-manage:customer-credit-plan:change"})
     @PutMapping("/update")
     @PutMapping("/update")
     public InvokeResult<Void> update(@Valid @RequestBody UpdateCustomerCreditVo vo) {
     public InvokeResult<Void> update(@Valid @RequestBody UpdateCustomerCreditVo vo) {
 
 

@@ -545,87 +545,87 @@ public class CustomerCreditServiceImpl extends BaseMpServiceImpl<CustomerCreditM
 
 
         getBaseMapper().update(updateWrapper);
         getBaseMapper().update(updateWrapper);
         //更新核心人员
         //更新核心人员
-//        List<UpdateCorePersonnelVo> corePersonnelListNew = vo.getCorePersonnelList();
-//        if (CollectionUtils.isNotEmpty(corePersonnelListNew)) {
-//            Set<String> oldIds = corePersonnelList.stream().map(CorePersonnel::getId).collect(Collectors.toSet());
-//            Set<String> newIds = corePersonnelListNew.stream().map(UpdateCorePersonnelVo::getId).collect(Collectors.toSet());
-//            // 计算差异
-//            Set<String> addedIds = new HashSet<>(newIds);
-//            addedIds.removeAll(oldIds); // 新增：new 有，old 没有
-//
-//            Set<String> removedIds = new HashSet<>(oldIds);
-//            removedIds.removeAll(newIds); // 删除：old 有，new 没有
-//
-//            Set<String> unchangedIds = new HashSet<>(oldIds);
-//            unchangedIds.retainAll(newIds); // 不变：交集
-//
-//            // 如果需要获取对应的实体对象（注意：id 唯一）
-//            Map<String, CorePersonnel> oldMap = corePersonnelList.stream().collect(Collectors.toMap(CorePersonnel::getId, e -> e));
-//            Map<String, UpdateCorePersonnelVo> newMap = corePersonnelListNew.stream().collect(Collectors.toMap(UpdateCorePersonnelVo::getId, e -> e));
-//
-//            List<UpdateCorePersonnelVo> added = addedIds.stream().map(newMap::get).collect(Collectors.toList());
-//            List<CorePersonnel> removed = removedIds.stream().map(oldMap::get).collect(Collectors.toList());
-//            List<UpdateCorePersonnelVo> updated = unchangedIds.stream().map(newMap::get).collect(Collectors.toList());
-//            // 输出结果
-//            System.out.println("新增: " + added);
-//            System.out.println("删除: " + removed);
-//            System.out.println("修改: " + updated);
-//            //新增
-//            for (UpdateCorePersonnelVo updateCorePersonnelVo : added) {
-//                CreateCorePersonnelVo createCorePersonnelVo = new CreateCorePersonnelVo();
-//                createCorePersonnelVo.setCreditId(vo.getId());
-//                if (!StringUtil.isBlank(updateCorePersonnelVo.getPersonId())) {
-//                    createCorePersonnelVo.setPersonId(updateCorePersonnelVo.getPersonId());
-//                }
-//                if (!StringUtil.isBlank(updateCorePersonnelVo.getName())) {
-//                    createCorePersonnelVo.setName(updateCorePersonnelVo.getName());
-//                }
-//                if (!StringUtil.isBlank(updateCorePersonnelVo.getSex())) {
-//                    createCorePersonnelVo.setSex(updateCorePersonnelVo.getSex());
-//                }
-//                if (!StringUtil.isBlank(updateCorePersonnelVo.getNativePlace())) {
-//                    createCorePersonnelVo.setNativePlace(updateCorePersonnelVo.getNativePlace());
-//                }
-//                if (!StringUtil.isBlank(updateCorePersonnelVo.getAge())) {
-//                    createCorePersonnelVo.setAge(updateCorePersonnelVo.getAge());
-//                }
-//                if (!StringUtil.isBlank(updateCorePersonnelVo.getPosition())) {
-//                    createCorePersonnelVo.setPosition(updateCorePersonnelVo.getPosition());
-//                }
-//                if (!StringUtil.isBlank(updateCorePersonnelVo.getMobile())) {
-//                    createCorePersonnelVo.setMobile(updateCorePersonnelVo.getMobile());
-//                }
-//                if (!StringUtil.isBlank(updateCorePersonnelVo.getPhone())) {
-//                    createCorePersonnelVo.setPhone(updateCorePersonnelVo.getPhone());
-//                }
-//                if (!StringUtil.isBlank(updateCorePersonnelVo.getEmail())) {
-//                    createCorePersonnelVo.setEmail(updateCorePersonnelVo.getEmail());
-//                }
-//                if (!StringUtil.isBlank(updateCorePersonnelVo.getAddress())) {
-//                    createCorePersonnelVo.setAddress(updateCorePersonnelVo.getAddress());
-//                }
-//                corePersonnelService.create(createCorePersonnelVo);
-//            }
-//            //删除
-//            for (CorePersonnel corePersonnel : removed) {
-//                corePersonnelService.deleteById(corePersonnel.getId());
-//            }
-//            //修改
-//            for (UpdateCorePersonnelVo updateCorePersonnelVo : updated) {
-//                corePersonnelService.update(updateCorePersonnelVo);
-//            }
-//        } else {
-//            if (CollectionUtils.isNotEmpty(corePersonnelList)) {
-//                for (CorePersonnel corePersonnel : corePersonnelList) {
-//                    corePersonnelService.deleteById(corePersonnel.getId());
-//                }
-//            }
-//        }
+        List<UpdateCorePersonnelVo> corePersonnelListNew = vo.getCorePersonnelList();
+        if (CollectionUtils.isNotEmpty(corePersonnelListNew)) {
+            Set<String> oldIds = corePersonnelList.stream().map(CorePersonnel::getId).collect(Collectors.toSet());
+            Set<String> newIds = corePersonnelListNew.stream().map(UpdateCorePersonnelVo::getId).collect(Collectors.toSet());
+            // 计算差异
+            Set<String> addedIds = new HashSet<>(newIds);
+            addedIds.removeAll(oldIds); // 新增：new 有，old 没有
+
+            Set<String> removedIds = new HashSet<>(oldIds);
+            removedIds.removeAll(newIds); // 删除：old 有，new 没有
+
+            Set<String> unchangedIds = new HashSet<>(oldIds);
+            unchangedIds.retainAll(newIds); // 不变：交集
+
+            // 如果需要获取对应的实体对象（注意：id 唯一）
+            Map<String, CorePersonnel> oldMap = corePersonnelList.stream().collect(Collectors.toMap(CorePersonnel::getId, e -> e));
+            Map<String, UpdateCorePersonnelVo> newMap = corePersonnelListNew.stream().collect(Collectors.toMap(UpdateCorePersonnelVo::getId, e -> e));
+
+            List<UpdateCorePersonnelVo> added = addedIds.stream().map(newMap::get).collect(Collectors.toList());
+            List<CorePersonnel> removed = removedIds.stream().map(oldMap::get).collect(Collectors.toList());
+            List<UpdateCorePersonnelVo> updated = unchangedIds.stream().map(newMap::get).collect(Collectors.toList());
+            // 输出结果
+            System.out.println("新增: " + added);
+            System.out.println("删除: " + removed);
+            System.out.println("修改: " + updated);
+            //新增
+            for (UpdateCorePersonnelVo updateCorePersonnelVo : added) {
+                CreateCorePersonnelVo createCorePersonnelVo = new CreateCorePersonnelVo();
+                createCorePersonnelVo.setCreditId(vo.getId());
+                if (!StringUtil.isBlank(updateCorePersonnelVo.getPersonId())) {
+                    createCorePersonnelVo.setPersonId(updateCorePersonnelVo.getPersonId());
+                }
+                if (!StringUtil.isBlank(updateCorePersonnelVo.getName())) {
+                    createCorePersonnelVo.setName(updateCorePersonnelVo.getName());
+                }
+                if (!StringUtil.isBlank(updateCorePersonnelVo.getSex())) {
+                    createCorePersonnelVo.setSex(updateCorePersonnelVo.getSex());
+                }
+                if (!StringUtil.isBlank(updateCorePersonnelVo.getNativePlace())) {
+                    createCorePersonnelVo.setNativePlace(updateCorePersonnelVo.getNativePlace());
+                }
+                if (!StringUtil.isBlank(updateCorePersonnelVo.getAge())) {
+                    createCorePersonnelVo.setAge(updateCorePersonnelVo.getAge());
+                }
+                if (!StringUtil.isBlank(updateCorePersonnelVo.getPosition())) {
+                    createCorePersonnelVo.setPosition(updateCorePersonnelVo.getPosition());
+                }
+                if (!StringUtil.isBlank(updateCorePersonnelVo.getMobile())) {
+                    createCorePersonnelVo.setMobile(updateCorePersonnelVo.getMobile());
+                }
+                if (!StringUtil.isBlank(updateCorePersonnelVo.getPhone())) {
+                    createCorePersonnelVo.setPhone(updateCorePersonnelVo.getPhone());
+                }
+                if (!StringUtil.isBlank(updateCorePersonnelVo.getEmail())) {
+                    createCorePersonnelVo.setEmail(updateCorePersonnelVo.getEmail());
+                }
+                if (!StringUtil.isBlank(updateCorePersonnelVo.getAddress())) {
+                    createCorePersonnelVo.setAddress(updateCorePersonnelVo.getAddress());
+                }
+                corePersonnelService.create(createCorePersonnelVo);
+            }
+            //删除
+            for (CorePersonnel corePersonnel : removed) {
+                corePersonnelService.deleteById(corePersonnel.getId());
+            }
+            //修改
+            for (UpdateCorePersonnelVo updateCorePersonnelVo : updated) {
+                corePersonnelService.update(updateCorePersonnelVo);
+            }
+        } else {
+            if (CollectionUtils.isNotEmpty(corePersonnelList)) {
+                for (CorePersonnel corePersonnel : corePersonnelList) {
+                    corePersonnelService.deleteById(corePersonnel.getId());
+                }
+            }
+        }
         OpLogUtil.setVariable("id", data.getId());
         OpLogUtil.setVariable("id", data.getId());
         OpLogUtil.setExtra(vo);
         OpLogUtil.setExtra(vo);
 
 
         //开启审核
         //开启审核
-//        flowInstanceWrapperService.startInstance(BPM_FLAG, data.getId(), BPM_FLAG, vo);
+        flowInstanceWrapperService.startInstance(BPM_FLAG, data.getId(), BPM_FLAG, vo);
     }
     }
 
 
     @OpLog(type = OtherOpLogType.class, name = "删除客户资信表，ID：{}", params = {"#id"})
     @OpLog(type = OtherOpLogType.class, name = "删除客户资信表，ID：{}", params = {"#id"})