字典操作 bug修改

service/zdgl/src/main/java/com/founder/zdgl/controller/DictManageController.java

@@ -43,9 +43,15 @@ public class DictManageController extends BaseAction {
         List<DictItem> dictItemList = new ArrayList<DictItem>();
         DictItem dictItem = new DictItem();
 
-        dictItem.setGroupid(groupid);
-        dictItem.setPid(pid);
-        dictItem.setScbz("0");
+        if ("CODE_MZ".equals(groupid) || "CODE_XZQH".equals(groupid)){
+            dictItem.setGroupid(groupid);
+            dictItem.setScbz("0");
+        } else {
+            dictItem.setGroupid(groupid);
+            dictItem.setPid(pid);
+            dictItem.setScbz("0");
+        }
+
 
         dictItemList = dictManageService.queryDictAll(dictItem);
         Map<String, Object> resultMap = new HashMap<String, Object>();

service/zdgl/src/main/java/com/founder/zdgl/mapper/xml/DictManageMapper.xml

@@ -55,7 +55,8 @@
         endcode,
         description
         from sys_dictitem
-        where 1=1 and pid = #{pid}
+        where 1=1
+        <if test="pid != null">and pid = #{pid}</if>
         <if test="groupid != null and groupid != ''">and groupid = #{groupid}</if>
         <if test="scbz != null and scbz != ''">and scbz = #{scbz}</if>
         <if test="code != null and code != ''">and code = #{code}</if>