update

mec-biz/src/main/resources/config/mybatis/EmployeeMapper.xml

@@ -260,7 +260,7 @@
             LEFT JOIN sys_user_role sur ON su.id_ = sur.user_id_
             LEFT JOIN employee e ON e.user_id_ = su.id_
         WHERE
-            FIND_IN_SET(sur.role_id_, #{roleIds})
+            e.lock_flag_ = 0 AND e.del_flag_ = 0 AND FIND_IN_SET(sur.role_id_, #{roleIds})
             <if test="organIds!=null and organIds!=''">
                 AND INTE_ARRAY(e.organ_id_list_,#{organIds})
             </if>

mec-im/src/main/java/com/ym/config/ResourceServerConfig.java

@@ -10,6 +10,6 @@ import org.springframework.security.oauth2.config.annotation.web.configuration.R
 public class ResourceServerConfig extends ResourceServerConfigurerAdapter {
     @Override
     public void configure(HttpSecurity http) throws Exception {
-        http.authorizeRequests().antMatchers("/v2/api-docs","/user/register","/group/join","/group/create","/room/leave","/room/statusSync","/group/batchDismiss","/private/send").permitAll().anyRequest().authenticated().and().csrf().disable();
+        http.authorizeRequests().antMatchers("/v2/api-docs","/user/register","/group/join","/group/create","/room/leave","/room/statusSync","/room/statusImMsg","/group/batchDismiss","/private/send").permitAll().anyRequest().authenticated().and().csrf().disable();
     }
 }

mec-im/src/main/java/com/ym/controller/RoomController.java

@@ -79,6 +79,11 @@ public class RoomController{
         return new BaseResponse<>(result);
     }
 
+    @RequestMapping(value = "/statusImMsg")
+    public void statusImMsg(@RequestBody String body) throws Exception {
+        System.out.println("");
+    }
+
     @RequestMapping(value = "/downgrade", method = RequestMethod.POST)
     public Object downRole(@RequestBody ReqChangeUserRoleData data)
             throws ApiException, Exception {

mec-web/src/main/java/com/ym/mec/web/controller/EmployeeController.java

@@ -152,16 +152,21 @@ public class EmployeeController extends BaseController {
 
     @ApiOperation(value = "获取教务人员")
     @GetMapping("/findEducationUsers")
-    public HttpResponseResult findEducationUsers(){
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        String organIds=new String();
-        if (sysUser == null) {
-            return failed("用户信息获取失败");
+    public HttpResponseResult findEducationUsers(Integer userId){
+        SysUser sysUser;
+        if(userId == null){
+            sysUser = sysUserFeignService.queryUserInfo();
+            if (sysUser == null) {
+                return failed("用户信息获取失败");
+            }
+        }else {
+            sysUser = sysUserFeignService.queryUserById(userId);
         }
+        String organIds = new String();
         if (!sysUser.getIsSuperAdmin()) {
             Employee employee = employeeService.get(sysUser.getId());
             if (StringUtils.isEmpty(organIds)) {
-                organIds=employee.getOrganIdList();
+                organIds = employee.getOrganIdList();
             }
         }
         return succeed(employeeService.findByRole("4,5",organIds));