Ver Fonte

筹建优化

guarantee-lsq há 11 meses atrás
pai
commit
dbb8b88901

+ 6 - 0
platform-dao/src/main/resources/mapper/preparation/PreparationMapper.xml

@@ -165,6 +165,9 @@
         <if test="delUserId != null and delUserId != ''">
             and preparation.del_user_id not like concat(concat('%',#{delUserId}),'%')
         </if>
+        <if test="receiveVerifyLeader != null and receiveVerifyLeader != ''">
+            and preparation.receive_verify_leader = #{receiveVerifyLeader}
+        </if>
     </sql>
     <select id="selectList" parameterType="com.platform.dao.dto.preparation.PreparationDTO"
             resultType="com.platform.dao.vo.query.preparation.PreparationVO">
@@ -208,6 +211,9 @@
                 or user_id = #{tempUserId}
                 or apply_verify_leader = #{tempUserId})
             </if>
+            <if test="receiveVerifyLeader != null and receiveVerifyLeader != ''">
+                and receive_verify_leader = #{receiveVerifyLeader}
+            </if>
             <if test="delUserId != null and delUserId != ''">
                 and del_user_id not like concat(concat('%',#{delUserId}),'%')
             </if>

+ 6 - 0
platform-service/src/main/java/com/platform/service/preparation/impl/PreparationServiceImpl.java

@@ -238,6 +238,9 @@ public class PreparationServiceImpl extends BaseServiceImpl<PreparationMapper, P
                 // 部门负责人(执行和申请)
                 roleFlag = 4;
                 record.setTempUserId(userInfo.getUserId());
+                if(SecurityUtils.getUserInfo().getUsername().equals("chenb")){
+                    record.setReceiveVerifyLeader(SecurityUtils.getUserInfo().getUserId());
+                }
             }else if(roles.contains(SysRoleCodeEnum.DEPT_MANAGER.name())){
                 // 申请部门主管
                 roleFlag = 3;
@@ -955,6 +958,9 @@ public class PreparationServiceImpl extends BaseServiceImpl<PreparationMapper, P
                 // 部门负责人(执行和申请)
                 roleFlag = 4;
                 preparationDTO.setTempUserId(userInfo.getUserId());
+                if(SecurityUtils.getUserInfo().getUsername().equals("chenb")){
+                    preparationDTO.setReceiveVerifyLeader(SecurityUtils.getUserInfo().getUserId());
+                }
             }else if(roles.contains(SysRoleCodeEnum.DEPT_MANAGER.name())){
                 // 申请部门主管
                 roleFlag = 3;