Merge branch '1.0' of http://gogs.tcmbrain.com/zjh/pre_paramater into 1.0

cbkj_web_parameter/src/main/resources/mappers/dic/TDicBaseMapper.xml

@@ -157,7 +157,7 @@
         INNER JOIN t_dic_base AS tb ON tb.dic_id=tdb.parent_id
         LEFT JOIN t_dic_mapping AS tdm ON tdb.dic_id=tdm.dic_id
         LEFT JOIN t_dic_standard AS tds ON tds.stan_id=tdm.stan_id
-        WHERE tdb.dic_id IN(SELECT dic_id FROM t_dic_mapping)
+            WHERE tdb.dic_id IN(SELECT dic_id FROM t_dic_mapping)
         and
         tdb.parent_id=#{dicId}
         <if test=" dicCode != null and dicCode!='' ">

cbkj_web_parameter/src/main/resources/mappers/sysApp/SysDepartmentMapper.xml

@@ -126,7 +126,7 @@
         from sys_department dep
         left join sys_app app on dep.app_id = app.app_id AND app.status = '0' AND app.status = '0'
         left join sys_institution ins on dep.ins_code = ins.ins_code AND ins.status = '0'
-        where dep.status = '0'
+        where dep.status = '0' or dep.status='2'
         <if test="appName != null and appName!='' ">
             and app.APP_NAME like CONCAT('%',trim(#{appName}),'%')
         </if>

cbkj_web_parameter/src/main/resources/mappers/sysApp/SysInstitutionMapper.xml

@@ -275,12 +275,12 @@
     </select>
 
 
-    <!--分页查询基础语句返回对象-->
+    <!--分页查询基础语句返回对象 status='0'-->
     <select id="getPageListByObj" parameterType="SysInstitution" resultMap="BaseResultMap">
         SELECT ins.*,(SELECT INS_NAME FROM sys_institution WHERE INS_CODE = ins.ins_parent_code limit 1) as INS_PNAME,
         (SELECT app_name FROM sys_app WHERE app_id = ins.APP_ID LIMIT 1) AS APP_NAME
         from sys_institution ins
-        where status='0'
+        where
         <!--条件-->
         <if test="insName != null and insName!='' ">
             and INS_NAME like CONCAT('%',trim(#{insName}),'%')