订单接口查询机构信息

diagbotman-service/src/main/java/com/diagbot/client/UserServiceClient.java

@@ -28,6 +28,9 @@ public interface UserServiceClient {
     @PostMapping(value = "/user/getUserAndOrg")
     RespDTO<Map<Long, UserOrgDTO>> getUserAndOrg(@RequestBody List<Long> userIds);
 
+    @PostMapping(value = "/user/getUserByOrgName")
+    RespDTO<List<Long>> getUserByOrgName(@RequestBody String orgName);
+
 }
 
 

diagbotman-service/src/main/java/com/diagbot/client/hystrix/UserServiceHystrix.java

@@ -32,4 +32,10 @@ public class UserServiceHystrix implements UserServiceClient {
         log.error("【hystrix】调用{}异常","getUserAndOrg");
         return null;
     }
+
+    @Override
+    public RespDTO<List<Long>> getUserByOrgName(String orgName) {
+        log.error("【hystrix】调用{}异常","getUserByOrgName");
+        return null;
+    }
 }

user-service/src/main/java/com/diagbot/config/ResourceServerConfigurer.java

@@ -39,6 +39,7 @@ public class ResourceServerConfigurer extends ResourceServerConfigurerAdapter {
                 .antMatchers("/userInfo/updateDeleted").permitAll()
                 .antMatchers("/user/index").permitAll()
                 .antMatchers("/user/getUserAndOrg").permitAll()
+                .antMatchers("/user/getUserByOrgName").permitAll()
                 .antMatchers("/**").authenticated();
 //        .antMatchers("/**").permitAll();
     }

user-service/src/main/java/com/diagbot/config/security/UrlAccessDecisionManager.java

@@ -50,6 +50,7 @@ public class UrlAccessDecisionManager implements AccessDecisionManager {
                 || matchers("/userInfo/getUserInfoPag", request)
                 || matchers("/user/getPermission", request)
                 || matchers("/user/index", request)
+                || matchers("/user/getUserByOrgName", request)
                 || matchers("/user/getUserAndOrg", request)
                 || matchers("/userInfo/updateUserInfoAll", request)
                 || matchers("/userInfo/updateDeleted", request)

user-service/src/main/java/com/diagbot/facade/UserFacade.java

@@ -35,6 +35,7 @@ import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Component;
 
 import java.io.Serializable;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -305,4 +306,16 @@ public class UserFacade extends UserServiceImpl {
 	    return getConsoleUserInfoDTO;
 	}
 
+
+    public List<Long> getUserByOrgNameFac(String orgName) {
+        List<Long> userIdList = new ArrayList<>();
+        if(StringUtil.isEmpty(orgName)) {
+            return userIdList;
+        }
+        List<User> userList = this.getUserByOrgName(orgName);
+        for(User bean : userList) {
+            userIdList.add(bean.getId());
+        }
+        return userIdList;
+    }
 }

user-service/src/main/java/com/diagbot/mapper/UserMapper.java

@@ -42,4 +42,6 @@ public interface UserMapper extends BaseMapper<User> {
     
     public Integer updateById(Map<String,String> map);
 
+    public List<User> getUserByOrgName(String orgName);
+
 }

user-service/src/main/java/com/diagbot/service/UserService.java

@@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.diagbot.dto.UserInfoDTO;
 import com.diagbot.dto.UserOrgDTO;
 import com.diagbot.entity.User;
-import com.diagbot.vo.UserInfoOrganizationsVO;
 
 import java.util.List;
 import java.util.Map;
@@ -38,4 +37,6 @@ public interface UserService extends IService<User> {
     public List<UserOrgDTO> getUserOrgByIds(List<Long> userIds);
 
     public boolean auditUserInfoAll(Map<String,Object> auditMap);
+
+    public List<User> getUserByOrgName(String orgName);
 }

user-service/src/main/java/com/diagbot/service/impl/UserServiceImpl.java

@@ -8,7 +8,6 @@ import com.diagbot.dto.UserOrgDTO;
 import com.diagbot.entity.User;
 import com.diagbot.mapper.UserMapper;
 import com.diagbot.service.UserService;
-import com.diagbot.vo.UserInfoOrganizationsVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -74,4 +73,9 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
 	    return baseMapper.auditUserInfoAll(auditMap);
     }
 
+    @Override
+    public List<User> getUserByOrgName(String orgName) {
+        return baseMapper.getUserByOrgName(orgName);
+    }
+
 }

user-service/src/main/java/com/diagbot/web/UserController.java

@@ -99,6 +99,17 @@ public class UserController {
     }
 
 
+    @PostMapping(value = "/getUserByOrgName")
+    @SysLogger("getUserByOrgName")
+    @ApiOperation(value = "远程调用，根据机构名称获取用户信息[by:zhoutg]")
+//    @ApiIgnore
+    RespDTO<List<Long>> getUserByOrgName(@RequestBody String name) {
+        List<Long> data =  userFacade.getUserByOrgNameFac(name);
+        return RespDTO.onSuc(data);
+    }
+
+
+
     /**
      * @Description: 用来测试分页，未用
      * @Author: ztg

user-service/src/main/resources/mapper/UserMapper.xml

@@ -78,16 +78,23 @@
 	</select>
 
 
+	<select id="getUserByOrgName" resultMap="BaseResultMap">
+		select a.* from sys_user a, sys_organization org, sys_user_organization uo
+		where a.is_deleted = 'N' and org.is_deleted = 'N' and uo.is_deleted = 'N'
+		and a.id = uo.user_id and uo.organization_id = org.id and org.`name` like concat('%' ,#{orgName}, '%')
+	</select>
 
 
-<!-- 	<select id="selectUserInfoListPage" resultMap="BaseResultMap">
-		select u.*
-		LEFT JOIN sys_user_role ur on u.id= ur.user_id
-		LEFT JOIN
-		sys_role r on ur.role_id=r.id
-		where u.is_deleted = 'N' and type = "0"
-		ORDER BY gmt_create DESC
-	</select> -->
+
+
+	<!-- 	<select id="selectUserInfoListPage" resultMap="BaseResultMap">
+            select u.*
+            LEFT JOIN sys_user_role ur on u.id= ur.user_id
+            LEFT JOIN
+            sys_role r on ur.role_id=r.id
+            where u.is_deleted = 'N' and type = "0"
+            ORDER BY gmt_create DESC
+        </select> -->
 	
    <!--  <select id="selectUserInfoPage"  parameterType="com.diagbot.dto.UserInfoDTO" resultType="com.diagbot.dto.UserInfoDTO">
 		SELECT