wanghao пре 1 месец
родитељ
комит
1bc5b202eb

+ 4 - 0
commons/src/main/java/com/jzg/commons/entity/dto/SysDeptParam.java

@@ -16,4 +16,8 @@ public class SysDeptParam {
 
 
     @Schema(description = "机构下用户的信息")
     @Schema(description = "机构下用户的信息")
     private String userInfo;
     private String userInfo;
+
+    @Schema(description = "是否参与分销 0-否 1-是")
+    private String isDistribution;
+
 }
 }

+ 6 - 0
commons/src/main/java/com/jzg/commons/entity/vo/SysDistributionSettingVo.java

@@ -48,6 +48,12 @@ public class SysDistributionSettingVo {
      * 不参与分销的机构id
      * 不参与分销的机构id
      */
      */
     private List<String> excludeDeptIds;
     private List<String> excludeDeptIds;
+    /**
+     * 所有机构的配置参与分销
+     */
+    private List<SysDeptVo> excludeDepts;
+
+
 
 
     /**
     /**
      * 租户code
      * 租户code

+ 5 - 5
tenant/organization/src/main/java/com/jzg/organization/service/impl/SysDistributionSettingServiceImpl.java

@@ -120,12 +120,12 @@ public class SysDistributionSettingServiceImpl extends ServiceImpl<SysDistributi
         }
         }
         BeanUtils.copyProperties(sysDistributionSettingVo, sysDistributionSetting);
         BeanUtils.copyProperties(sysDistributionSettingVo, sysDistributionSetting);
         sysDistributionSettingMapper.updateById(sysDistributionSetting);
         sysDistributionSettingMapper.updateById(sysDistributionSetting);
-        if (sysDistributionSettingVo.getExcludeDeptScope().equals("2")) {
-            List<SysDept> sysDeptList = sysDeptService.listByIds(sysDistributionSettingVo.getExcludeDeptIds());
-            sysDeptList.forEach(item -> {
-                item.setIsDistribution("0"); //设置不参与分销机构
+        if(sysDistributionSettingVo.getExcludeDepts() != null){
+            sysDistributionSettingVo.getExcludeDepts().forEach(item -> {
+                SysDept dept = sysDeptService.getById(item.getId());
+                dept.setIsDistribution(item.getIsDistribution());
+                sysDeptService.updateById(dept);
             });
             });
-            sysDeptService.updateBatchById(sysDeptList);
         }
         }
         return HttpResult.ok("修改成功");
         return HttpResult.ok("修改成功");
     }
     }