作息查询取消排停用机构

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/util/Sm4Util.java

@@ -185,7 +185,7 @@ public class Sm4Util {
 
 
     public static void main(String[] args) {
-        String s = encryptEcb("51d95b1dc43a9faaad0570f81c755fcf", "update core_edu_training_task set  status=2 where id='1812463465882353673';");
+        String s = encryptEcb("51d95b1dc43a9faaad0570f81c755fcf", "update core_edu_training_task set status=2 where id ='1818693103684059144';");
 
         System.out.println(s);
 

soc-modules/soc-modules-system/src/main/resources/mapper/system/SysWorkTimeMapper.xml

@@ -131,7 +131,7 @@
             o.short_name as orgName
         FROM
             sys_work_time t
-            LEFT JOIN sys_org o ON t.org_id = o.id AND o.deleted=0 AND o.is_lock=0
+            LEFT JOIN sys_org o ON t.org_id = o.id AND o.deleted=0
             ${ew.customSqlSegment}
     </select>
     <select id="selectNoWorkTimeByPage" resultType="com.xunmei.system.dto.SysWorkTimeDto">
@@ -149,7 +149,7 @@
                  ${ew.customSqlSegment}
             ) c
             ON c.org_id = o1.id
-            where c.id is null AND o1.deleted=0 AND o1.is_lock=0
+            where c.id is null AND o1.deleted=0
         <choose>
             <when test="request.checkSub==true">
                AND o1.path like concat('%',#{request.orgId}, '%')