6

jinlin

2023-12-04 4335ef915a6ed130588815256c977fe3ee0c721e

6

 modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/service/ConfigItemWarehouseService.java

@@ -129,7 +129,7 @@
        Long bizId = configItemDto.getConfigItemWarehouse().getId();
        FlowInfoDto flowInfoDto = configItemDto.getFlowInfoDto();

        if (flowInfoDto != null && flowInfoDto.getBizId() != null && "tj,bl".contains(flowInfoDto.getSubmitType())) {
        if (flowInfoDto != null && "tj,bl".contains(flowInfoDto.getSubmitType())) {
            if ("tj".equals(flowInfoDto.getSubmitType())) {
                workflowService.startFlow(flowInfoDto.getFlowCode(), bizId);
            }

 modules/mainPart/src/main/java/com/zt/life/modules/itemCirculatOrder/service/ItemCirculatOrderService.java

@@ -120,7 +120,7 @@
        Long bizId = itemCirculatOrderDto.getCirculatOrder().getId();
        FlowInfoDto flowInfoDto = itemCirculatOrderDto.getFlowInfoDto();

        if (flowInfoDto != null && flowInfoDto.getBizId() != null && "tj,bl".contains(flowInfoDto.getSubmitType())) {
        if (flowInfoDto != null && "tj,bl".contains(flowInfoDto.getSubmitType())) {
            if ("tj".equals(flowInfoDto.getSubmitType())) {
                workflowService.startFlow(flowInfoDto.getFlowCode(), bizId);
            }

 zt/core/src/main/resources/mapper/sys/SysRoleMenuDao.xml

@@ -13,7 +13,7 @@
        FROM
            SYS_ROLE_MENU m
            LEFT JOIN SYS_ROLE_USER r ON r.ROLE_ID = m.role_id
            LEFT JOIN SYS_USER u ON u.user_id = r.USER_ID
            LEFT JOIN SYS_USER u ON u.id = r.USER_ID
        WHERE 1=1
            AND m.role_id = #{id}
            AND m.menu_id in(1385805134214275073,1386158810275553282)

 zt/core/src/main/resources/mapper/sys/SysUserDao.xml

@@ -29,17 +29,17 @@
    </select>

    <select id="getById" resultType="com.zt.core.sys.model.SysUser">
        select a.user_id             as                                            id
        select a.id
             , a.dept_id
             , a.dept_id             as                                            company_id
             , a.company_id
             , '1271368584383188993' as                                            TENANT_ID
             , a.user_name           as                                            username
             , a.nick_name           as                                            real_name
             , a.phonenumber         as                                            MOBILE
             , a.username
             , a.real_name
             , a.MOBILE
             , (select t2.dept_name from SYS_DEPT t2 where t2.dept_id = a.dept_id) deptName
        from SYS_USER a
        where a.del_flag = 0
          and a.user_id = #{value}
          and a.id = #{value}
        limit 1
    </select>

@@ -65,8 +65,8 @@
             sys_role c
        where b.IS_DELETE = 0
          and c.IS_DELETE = 0
          and a.user_id = #{userId}
          and b.user_id = a.user_id
          and a.id = #{userId}
          and b.user_id = a.id
          and c.id = b.role_id
          and ((#{localServer} = 'jd' and c.code in ('cjbm','ztsxlbm'))
              or (#{localServer} = 'cj'
@@ -76,17 +76,17 @@
    </select>
    <select id="isGetByUsernameList" resultType="com.zt.core.sys.model.SysUser">
        select
        a.user_id as id
        a.id
        ,a.dept_id
        ,a.dept_id as company_id
        ,a.company_id
        ,'1271368584383188993' as TENANT_ID
        ,a.user_name as username
        ,a.nick_name as real_name
        ,a.phonenumber as MOBILE
        ,a.username
        ,a.real_name
        ,a.MOBILE
        ,a.password
        from
        SYS_USER a
        where del_flag = 0
        where is_delete = 0
        and user_name = #{username}
        <if test="unitid != null and unitid != ''">
            and dept_id = #{unitid}
@@ -100,16 +100,16 @@
    </select>

    <select id="isDomainName" resultType="com.zt.core.sys.model.SysUser">
        select a.user_id             as                                            id
        select a.id
             , a.dept_id
             , a.dept_id             as                                            company_id
             , a.company_id
             , '1271368584383188993' as                                            TENANT_ID
             , a.user_name           as                                            username
             , a.nick_name           as                                            real_name
             , a.phonenumber         as                                            MOBILE
             , a.username
             , a.real_name
             , a.MOBILE
             , (select t2.dept_name from SYS_DEPT t2 where t2.dept_id = a.dept_id) deptName
        from SYS_USER a
        where a.del_flag = 0
        where a.is_delete = 0
#         and a.code = #{code}
    </select>

@@ -170,21 +170,21 @@
            <if test="isLocked!=null">is_locked=#{isLocked},</if>
            <if test="lastLoginErrorTime!=null">last_login_error_time=#{lastLoginErrorTime}</if>
        </trim>
        WHERE user_id=#{id}
        WHERE id=#{id}
    </update>
    <select id="getByDeptIds" resultType="com.zt.core.sys.model.SysUser">
        SELECT
        b.user_id as id
        b.id
        ,b.dept_id
        ,b.dept_id as company_id
        ,b.company_id
        ,'1271368584383188993' as TENANT_ID
        ,b.user_name as username
        ,b.nick_name as real_name
        ,b.phonenumber as MOBILE
        ,b.username
        ,b.real_name
        ,b.MOBILE
        FROM
        SYS_USER b
        WHERE
        b.del_flag = 0
        b.is_delete = 0
        and dept_id in
        <foreach collection="deptIds" index="index" item="item" open="(" separator="," close=")">
            #{item}
@@ -207,7 +207,7 @@
        select *
        from sys_user
        where dept_id = #{newShipTeam}
          and user_id in (select user_id
          and id in (select user_id
                          from sys_role_user a,
                               sys_role b
                          where a.role_id = b.id
@@ -219,11 +219,11 @@
        FROM
            sys_user
        WHERE
            del_flag = 0
          AND user_id = #{userId}
            is_delete = 0
          AND id = #{userId}
          AND (
                user_name IN ( 'admin', 'yszl' )
                OR user_id IN (
                OR id IN (
                SELECT
                    user_id
                FROM
@@ -238,13 +238,13 @@
            )
    </select>
    <select id="getUsersList" resultType="com.zt.core.sys.model.SysUser">
        select nick_name as name,user_id as id from sys_user
        select real_name as name,id as id from sys_user
    </select>

    <update id="updatePassword">
        update
        SYS_USER
        set password = #{password}
        WHERE user_id=#{id}
        WHERE id=#{id}
    </update>
</mapper>