1 năm trước cách đây
mục cha
commit
056062a3be

+ 3 - 0
platform-dao/src/main/resources/mapper/sbUnused/SbUnusedMapper.xml

@@ -76,6 +76,9 @@
         <if test="hFlag!=null and hFlag == 1">
             and unused.status!=1
         </if>
+        <if test="hFlag!=null and hFlag == 2">
+            and unused.status!=2
+        </if>
     </sql>
     <select id="selectList" parameterType="com.platform.dao.dto.sbUnused.SbUnusedDTO" resultType="com.platform.dao.vo.query.sbUnused.SbUnusedVO">
         select unused.*,user.real_name as applyName,user2.real_name as verifyUserName,user3.real_name as verifyUserName2

+ 5 - 0
platform-service/src/main/java/com/platform/service/sbUnused/impl/SbUnusedServiceImpl.java

@@ -348,6 +348,9 @@ public class SbUnusedServiceImpl extends BaseServiceImpl<SbUnusedMapper, SbUnuse
                 if (userInfo.getUserId().equals("636c57bd3abe1415981b18ec")){
                     statusList = new ArrayList<>();
                     statusList.add(2);
+                }else if (userInfo.getSuperAdmin()!=1&&!userInfo.getUserId().equals("636c57bd3abe1415981b18ec")){
+                    statusList = new ArrayList<>();
+                    statusList.add(1);
                 }
 
                 record.setStatusList(statusList);
@@ -360,6 +363,8 @@ public class SbUnusedServiceImpl extends BaseServiceImpl<SbUnusedMapper, SbUnuse
                 }
                 if (userInfo.getUserId().equals("636c57bd3abe1415981b18ec")){
                     record.setHFlag(1);
+                }else if (!userInfo.getUserId().equals("636c57bd3abe1415981b18ec")&&userInfo.getSuperAdmin()!=1){
+                    record.setHFlag(2);
                 }
             }
         }else {