Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

lidongdong

2022-11-18 3ff198d0d2d88eb940a2b0eeb6da9e03a152df1d

Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

 flower_city/src/main/java/com/dg/core/db/gen/entity/SysUser.java

@@ -268,6 +268,10 @@
    private String departmentIds;


    @ApiModelProperty("多部门ids")
    private String moreDepartmentIds;


    @TableField(exist = false)
    @ApiModelProperty("办理事项名称")
    private String mattersNames;

 flower_city/src/main/resources/mapper/SysUserMapper.xml

@@ -39,6 +39,7 @@
        <result property="isDivisionHead"      column="is_division_head"      />
        <result property="mattersIds"      column="matters_ids"      />
        <result property="departmentIds"      column="department_ids"      />
        <result property="moreDepartmentIds"      column="more_department_ids"      />
    </resultMap>

    <sql id="selectSysUserVo">
@@ -70,6 +71,7 @@
            second_level_id,
            matters_ids,
            department_ids,
            more_department_ids,
            (SELECT GROUP_CONCAT(matter_name) FROM automessage_transaction_event WHERE id in (SELECT
              substring_index(substring_index(matters_ids,',', b.help_topic_id + 1), ',', -1) result
          FROM
@@ -104,7 +106,13 @@
             automessage_guide_repair_order.guide_department_id=automessage_sys_user.department_id) as transactionEndNum,
            (select role_name from automessage_role_management where automessage_role_management.id=role_ids) as roleName,
            (select permission from automessage_role_management where automessage_role_management.id=role_ids) as permission,
            (select organization_name from automessage_organization_chart where automessage_sys_user.department_id=automessage_organization_chart.id) as department_name

            (SELECT GROUP_CONCAT(organization_name) FROM automessage_organization_chart WHERE id in (SELECT
                  substring_index(substring_index(more_department_ids,',', b.help_topic_id + 1), ',', -1) result
              FROM
                  mysql.help_topic b
              where
                  b.help_topic_id &lt; (LENGTH(more_department_ids) - LENGTH(REPLACE(more_department_ids, ',', '')) + 1))) as department_name
        FROM
            automessage_sys_user
    </sql>
@@ -255,6 +263,7 @@
        <if test="isDivisionHead != null and isDivisionHead != '' ">,is_division_head</if>
        <if test="mattersIds != null  ">,matters_ids</if>
        <if test="departmentIds != null  ">,department_ids</if>
        <if test="moreDepartmentIds != null  ">,more_department_ids</if>
        )values(
        sysdate()
        <if test="userId != null and userId != '' ">,#{userId}</if>
@@ -291,6 +300,7 @@
        <if test="isDivisionHead != null and isDivisionHead != '' ">,#{isDivisionHead}</if>
        <if test="mattersIds != null">,#{mattersIds}</if>
        <if test="departmentIds != null  ">,#{departmentIds}</if>
        <if test="moreDepartmentIds != null  ">,#{moreDepartmentIds}</if>
        )
    </insert>

@@ -331,6 +341,7 @@
            <if test="isDivisionHead != null and isDivisionHead != '' ">,is_division_head=#{isDivisionHead}</if>
            <if test="mattersIds != null">,matters_ids=#{mattersIds}</if>
            <if test="departmentIds != null  ">,department_ids=#{departmentIds}</if>
            <if test="moreDepartmentIds != null  ">,more_department_ids=#{moreDepartmentIds}</if>
            ,update_time=sysdate()
        </set>
        where user_id= #{userId}