From 49717866d123f0bf269675a8b698e20ae880fa3c Mon Sep 17 00:00:00 2001
From: paidaxing444 <12qwaszx>
Date: Wed, 2 Sep 2020 11:05:42 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=81=E4=B9=A0=E4=B9=8B=E6=98=9F=E8=80=83?=
 =?UTF-8?q?=E6=A0=B8-=E5=8C=BA=E7=BA=A7=E5=AE=A1=E6=A0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruoyi/web/controller/jxzxkhgl/TsbzJxzxkhshController.java | 4 ++--
 .../src/main/resources/mapper/jxzxkhgl/TsbzJxzxkhshMapper.xml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

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 @@
     </resultMap>
 
     <sql id="selectTsbzJxzxkhshVo">
-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