Merge branch '陈航-修改机构报错问题' of sckj/mz-cloud into master

ruoyi-modules/mz-business/src/main/resources/mapper/business/ZwywJgBnMapper.xml

@@ -106,7 +106,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         getxzqhmcbycode(a.ssxzqh) ssxzqh_name,
         a.*
         FROM zwyw_jg_bn a
-        RIGHT JOIN ( SELECT id,MAX(create_time_str) str FROM zwyw_jg_bn GROUP BY jg_id ) b
+        RIGHT JOIN ( SELECT MAX(create_time_str) str FROM zwyw_jg_bn GROUP BY jg_id ) b
         ON a.create_time_str = b.str
         <where>
             <if test="tyshxydm != null and tyshxydm != ''"> and a.tyshxydm = #{tyshxydm}</if>
@@ -184,7 +184,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 --         a.create_time_str, a.create_user_id, a.create_by, a.create_unit, a.create_unit_name,
 --         a.update_time_str, a.update_user_id, a.update_by, a.update_unit, a.update_unit_name
         FROM zwyw_jg_bn a
-        RIGHT JOIN ( SELECT id,MAX(create_time_str) str FROM zwyw_jg_bn GROUP BY jg_id ) b
+        RIGHT JOIN ( SELECT MAX(create_time_str) str FROM zwyw_jg_bn GROUP BY jg_id ) b
         ON a.create_time_str = b.str
         <where>
             <if test="tyshxydm != null and tyshxydm != ''"> and a.tyshxydm = #{tyshxydm}</if>

ruoyi-modules/mz-organization-jg/src/main/java/com/ruoyi/organization/service/impl/YljgJgjsServiceImpl.java

@@ -53,7 +53,7 @@ public class YljgJgjsServiceImpl implements IYljgJgjsService
      * @return 结果
      */
     @Override
-    @Transactional
+//    @Transactional
     public int insertYljgJgjs(YljgJgjs yljgJgjs)
     {
         yljgJgjsMapper.deleteYljgJgjsByJgIds(yljgJgjs.getJgid());

ruoyi-modules/mz-organization-jg/src/main/resources/mapper/organization/YljgJcxxMapper.xml

@@ -860,7 +860,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectYljgZhxxList" parameterType="YljgJcxx" resultType="java.util.HashMap">
         SELECT
         a.id, a.tyshxydm, a.jgmc, a.ssxzqh, a.frxm, a.frlxfs, a.create_unit, a.create_bmjsc,
-        CASE WHEN b.user_id IS NULL THEN '02' WHEN a.sczt = '07' THEN '03' WHEN a.sczt in('01','04','05','06') THEN '01' END AS `status`,
+        CASE WHEN MAX(b.user_id) IS NULL THEN '02' WHEN a.sczt = '07' THEN '03' WHEN a.sczt in('01','04','05','06') THEN '01' END AS `status`,
         GROUP_CONCAT(b.user_name,'(',IF(`status`='0','启用','禁用'),')') as userName
         FROM yljg_jcxx a
         LEFT JOIN sys_user b ON a.id = b.jg_id and ( b.del_flag is null or b.del_flag = 0 )