演练bug处理

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/edu/service/impl/CoreEduTrainingPlanServiceImpl.java

@@ -285,9 +285,9 @@ public class CoreEduTrainingPlanServiceImpl extends ServiceImpl<CoreEduTrainingP
             SysOrg sysOrg = RemoteCallHandlerExecutor.executeRemoteCall(() ->
                     orgService.selectOrgById(SecurityUtils.getLoginUser().getOrgId(), SecurityConstants.INNER), ErrorMsgConstants.QUERY_ORG_DATA_ERROR);
             if (ObjectUtil.equal(sysOrg.getType(), OrgTypeEnum.SHEGN_LIAN_SHE.getCode())) {
-                errorMsg = "当前用户身份仅允许修改子计划的计划名称和演练次数!!";
+                errorMsg = "当前用户身份仅允许修改子计划的培训主题和培训次数!!";
             } else {
-                errorMsg = "当前用户身份仅允许修改子计划的演练次数!";
+                errorMsg = "当前用户身份仅允许修改子计划的培训次数!";
             }
             validatePlanForStandard(request, plan, errorMsg, sysOrg.getType());
         }

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/impl/SysUserServiceImpl.java

@@ -129,6 +129,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
      */
     @Override
     public List<SysUser> selectSyncUserList(SysUser user) {
+        user.setDeleted(0);
         return userMapper.selectSyncUserList(user);
     }
 

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

@@ -197,7 +197,7 @@
     <select id="selectSyncUserList" parameterType="com.xunmei.system.api.domain.SysUser"
             resultType="com.xunmei.system.api.domain.SysUser">
         select *
-        from sys_user u where deleted=0
+        from sys_user u where deleted !=1  and is_lock !=1  and locked != 1
         <if test="source != null">
             AND u.source =#{source}
         </if>