diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/jxzxkhgl/TsbzJxzxkhshController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/jxzxkhgl/TsbzJxzxkhshController.java index 2d3f5d81b..0c5ada912 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/jxzxkhgl/TsbzJxzxkhshController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/jxzxkhgl/TsbzJxzxkhshController.java @@ -100,13 +100,13 @@ public class TsbzJxzxkhshController extends BaseController { @PutMapping public AjaxResult edit(@RequestBody TsbzJxzxkhsh tsbzJxzxkhsh) { //校级 - if(!schoolCommonController.isStringEmpty(tsbzJxzxkhsh.getXjshjy())&&tsbzJxzxkhsh.getXjshjy()=="1") { + if(!schoolCommonController.isStringEmpty(tsbzJxzxkhsh.getXjshjy())&&tsbzJxzxkhsh.getXjshjy().equals("1")) { tsbzJxzxkhsh.setXjshr(SecurityUtils.getLoginUser().getUser().getUserId()); tsbzJxzxkhsh.setStatus("2"); } //区级 - if(!schoolCommonController.isStringEmpty(tsbzJxzxkhsh.getQjshjy())&&tsbzJxzxkhsh.getQjshjy()=="1") { + if(!schoolCommonController.isStringEmpty(tsbzJxzxkhsh.getQjshjy())&&tsbzJxzxkhsh.getQjshjy().equals("1")) { tsbzJxzxkhsh.setQjshr(SecurityUtils.getLoginUser().getUser().getUserId()); tsbzJxzxkhsh.setStatus("9"); } diff --git a/ruoyi-system/src/main/resources/mapper/jxzxkhgl/TsbzJxzxkhshMapper.xml b/ruoyi-system/src/main/resources/mapper/jxzxkhgl/TsbzJxzxkhshMapper.xml index f9bab3239..1aaf5c500 100644 --- a/ruoyi-system/src/main/resources/mapper/jxzxkhgl/TsbzJxzxkhshMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/jxzxkhgl/TsbzJxzxkhshMapper.xml @@ -47,7 +47,7 @@ -selectd.id,d.faid,d.jsid,d.status,d.xjshr,d.xjshyj,d.xjshjy,d.qjshr,d.qjshjy,d.qjshyj,d.createuseird,d.create_time,b.name,b.prdwmc from tsbz_jxzxmd a +select d.id,d.faid,d.jsid,d.status,d.xjshr,d.xjshyj,d.xjshjy,d.qjshr,d.qjshjy,d.qjshyj,d.createuseird,d.create_time,b.name,b.prdwmc from tsbz_jxzxmd a left join tsbz_jxjsjbxx b on b.id=a.jsid left join sys_dept c on b.prdwid=c.schoolid left join tsbz_jxzxkhsh d on a.jsid=d.jsid