2025-09-17 wj 整体修改1

qianhe-ydsj/src/main/java/com/qianhe/controller/SjGfjsZsdwkhpjController.java

@@ -474,9 +474,37 @@ public class SjGfjsZsdwkhpjController extends BaseController
 
 
     @PutMapping("/editZsdwPm")
-    public AjaxResult edit(@RequestBody SjGfjsZsdwkhpjZb sjGfjsZsdwkhpjZbnew)
+    public AjaxResult edit(@RequestBody SjGfjsZsdwkhpjZb in)
     {
-        return toAjax(sjGfjsZsdwkhpjZbService.updateSjGfjsZsdwkhpjZb(sjGfjsZsdwkhpjZbnew));
+        Long in_id = in.getId();
+        int in_pm = in.getPm();
+        if (in_id == null) {
+            return error("未获取到主键id！");
+        }
+        if (in_pm <= 0) {
+            return error("排名不能小于等于0！");
+        }
+
+        //校验排名不能重复
+        SjGfjsZsdwkhpjZb upd_id_zb = sjGfjsZsdwkhpjZbService.selectSjGfjsZsdwkhpjZbById(in.getId());
+        SjGfjsZsdwkhpjZb qry_zb = new SjGfjsZsdwkhpjZb();
+        qry_zb.setZt("1");
+        qry_zb.setJb("直属单位");
+        qry_zb.setNd(upd_id_zb.getNd());
+        qry_zb.setZqfw(upd_id_zb.getZqfw());
+        qry_zb.setZqlx(upd_id_zb.getZqlx());
+        qry_zb.setParentDeptId(upd_id_zb.getParentDeptId());
+        //查询出现有数据 排名情况
+        List<SjGfjsZsdwkhpjZb> list = sjGfjsZsdwkhpjZbService.selectSjGfjsZsdwkhpjZbList(qry_zb);
+        //校验是否有重复  重复则 true
+        boolean chongfu = list.stream().filter(e -> e.getPm() == in_pm).anyMatch(e -> {
+            return !in_id.equals(e.getId()); // 目标id不为null时，直接比较是否不等
+        });
+        if (chongfu) {
+            return error("出入的排名重复！");
+        }
+
+        return toAjax(sjGfjsZsdwkhpjZbService.updateSjGfjsZsdwkhpjZb(in));
     }