20230414_sun修正整体过滤

ruoyi-modules/mz-business-djpd/src/main/java/com/ruoyi/business/service/impl/ZwywBgdjpdSqServiceImpl.java

@@ -108,9 +108,11 @@ public class ZwywBgdjpdSqServiceImpl implements IZwywBgdjpdSqService
             if (ObjectUtils.isEmpty(sq)) {
                 throw new ServiceException("该机构的申请为上级提交，需要上级进行审核");
             }
-            sq.setSqdj(zwywBgdjpdSq.getSqbgdj());
-            sq.setPddj(zwywBgdjpdSq.getSqbgdj());
-            djpdSqServiceImpl.updateDjpdSq(sq);
+            DjpdSq up = new DjpdSq();
+            up.setId(sq.getId());
+            up.setSqdj(zwywBgdjpdSq.getSqbgdj());
+            up.setPddj(zwywBgdjpdSq.getSqbgdj());
+            djpdSqServiceImpl.updateDjpdSq(up);
         }
         zwywBgdjpdSq.setSqbgzt(ChangeAppStatus.FPUB.getCode());
         return zwywBgdjpdSqMapper.updateById(zwywBgdjpdSq);

ruoyi-modules/mz-organization-khgl/src/main/java/com/ruoyi/organization/service/impl/YljgKhHfdjServiceImpl.java

@@ -122,11 +122,13 @@ public class YljgKhHfdjServiceImpl implements IYljgKhHfdjService
             yljgKhHfdj.setXm(htxx.getXm());
             yljgKhHfdj.setZjhm(htxx.getZjhm());
             yljgKhHfdj.setRzrq(htxx.getSjrzsj());
-            htxx.setCwId(yljgKhHfdj.getXcwId());
-            htxx.setFjId(yljgKhHfdj.getXfjId());
-            htxx.setCwh(yljgKhHfdj.getXcw());
-            htxx.setFjh(yljgKhHfdj.getXfj());
-            yljgKhHtxxMapper.updateYljgKhHtxx(htxx);
+            YljgKhHtxx up = new YljgKhHtxx();
+            up.setId(htxx.getId());
+            up.setCwId(yljgKhHfdj.getXcwId());
+            up.setFjId(yljgKhHfdj.getXfjId());
+            up.setCwh(yljgKhHfdj.getXcw());
+            up.setFjh(yljgKhHfdj.getXfj());
+            yljgKhHtxxMapper.updateYljgKhHtxx(up);
         }
         return yljgKhHfdjMapper.insertYljgKhHfdj(yljgKhHfdj);
     }