Преглед изворни кода

管理员搜索列表去空处理修改

anderx пре 3 година
родитељ
комит
0489a7efdd

+ 3 - 2
src/main/java/com/goafanti/ambSystem/service/Impl/AmbServiceImpl.java

@@ -44,11 +44,12 @@ public class AmbServiceImpl extends BaseMybatisDao<AmbSystemMapper> implements A
     public int updateAmb(InputAmb in) {
         AmbSystem use = ambSystemMapper.selectByPrimaryKey(in.getId());
         int i=0;
-        if (in.getParentId()!=use.getParentId()){
+
+        if (in.getParentId()!=null&&in.getParentId()!=use.getParentId()){
             getParentParam(in);
             i=updateAncestorsNames(in,use.getName(),i);
         }
-        if (!in.getName().equals(use.getName())){
+        if (in.getName()!=null&&!in.getName().equals(use.getName())){
             i=updateAncestorsNames(in,use.getName(),i);
         }
         in.setUpdateBy(TokenManager.getAdminId());

+ 2 - 2
src/main/java/com/goafanti/common/mapper/AmbSystemMapper.xml

@@ -239,7 +239,7 @@
     left join admin b on a.leader =b.id
     left join admin c on a.finance_id =c.id
     left join admin d on a.accountant =d.id
-    where a.status=0
+    where 1=1
     <if test="lvl &lt; 5">
       and a.lvl= #{lvl}
     </if>
@@ -266,7 +266,7 @@
     from amb_system a
     left join admin b on a.leader =b.id
     left join admin c on a.finance_id =c.id
-    where a.status=0
+    where 1=1
     <if test="lvl &lt; 5">
       and a.lvl= #{lvl}
     </if>