2025-10-11 wj 整体修改3

qianhe-ydsj/src/main/java/com/qianhe/service/impl/SjBzxxServiceImpl.java

@@ -136,15 +136,30 @@ public class SjBzxxServiceImpl implements ISjBzxxService
     @DataScope(deptAlias = "d")
     public List<SjBzxx> dwbzrstjList(SjBzxx sjBzxx)
     {
+        Long get_deptId = sjBzxx.getDeptId();
+        String get_zsdwfl = sjBzxx.getZsdwfl();
+        String get_bzlx = sjBzxx.getBzlx();
+
+        //直属单位
         SysDept s_in = new SysDept();
-        s_in.setDeptId(sjBzxx.getDeptId());
-        s_in.setDeptYwfl(sjBzxx.getZsdwfl());
-        List<SysDept> deptList = sysDeptMapper.selectDeptList(s_in);
-        List<SjBzxx> bzs = sjBzxxMapper.selectSjBzxxList(new SjBzxx());//班组
+        s_in.setDeptId(get_deptId);
+        s_in.setDeptYwfl(get_zsdwfl);
+        s_in.setDwjb("3");
+        List<SysDept> zss = sysDeptMapper.selectDeptList(s_in);
+        //基层单位
+        SysDept s_in2 = new SysDept();
+        s_in2.setDwjb("4");
+        List<SysDept> jcs = sysDeptMapper.selectDeptList(s_in2);
+
+        //班组
+        SjBzxx bz_in = new SjBzxx();
+        bz_in.setBzlx(get_bzlx);
+        List<SjBzxx> bzs = sjBzxxMapper.selectSjBzxxList(bz_in);
+
         List<SysDeptCb> cbs = sysDeptCbService.selectSysDeptCbList(new SysDeptCb());//单位从表
 
-        List<SysDept> zss = deptList.stream().filter(e->"3".equals(e.getDwjb())).collect(Collectors.toList());//直属单位
-        List<SysDept> jcs = deptList.stream().filter(e->"4".equals(e.getDwjb())).collect(Collectors.toList());//基层单位
+        //List<SysDept> zss = deptList.stream().filter(e->"3".equals(e.getDwjb())).collect(Collectors.toList());//直属单位
+        //List<SysDept> jcs = deptList.stream().filter(e->"4".equals(e.getDwjb())).collect(Collectors.toList());//基层单位
 
         List<SjBzxx> rts = new ArrayList<>();//返回结果
         for(int i = 0; i < zss.size(); i++){//循环直属单位
@@ -176,6 +191,9 @@ public class SjBzxxServiceImpl implements ISjBzxxService
                 SysDeptCb jcdwcb = cbs.stream().filter(e->String.valueOf(jcdwId).equals(e.getDeptId())).findAny().orElse(new SysDeptCb());
                 String jcdwfl = jcdwcb.getDwlx();
                 Long jcdwrs = jcdwcb.getJcrysl();//用工人数小计
+                if(jcdwrs == null) {
+                    jcdwrs = 0L;
+                }
 
                 //查询基层单位 班组
                 List<SjBzxx> bdwbzs = bzs.stream().filter(e->jcdwId.equals(e.getDeptId())).collect(Collectors.toList());