Merge remote-tracking branch 'origin/master'

mec-biz/src/main/java/com/ym/mec/biz/dal/page/OrganizationQueryInfo.java

@@ -1,9 +1,8 @@
 package com.ym.mec.biz.dal.page;
 
-import io.swagger.annotations.ApiModelProperty;
-
 import com.ym.mec.biz.dal.enums.YesOrNoEnum;
 import com.ym.mec.common.page.QueryInfo;
+import io.swagger.annotations.ApiModelProperty;
 
 public class OrganizationQueryInfo extends QueryInfo {
 
@@ -12,8 +11,6 @@ public class OrganizationQueryInfo extends QueryInfo {
 
     @ApiModelProperty(value = "节点状态，默认0未删除，1删除",required = false)
     private YesOrNoEnum delFlag = YesOrNoEnum.NO;
-    
-    private String organId;
 
     public YesOrNoEnum getDelFlag() {
         return delFlag;
@@ -30,12 +27,4 @@ public class OrganizationQueryInfo extends QueryInfo {
     public void setParentId(Integer parentId) {
         this.parentId = parentId;
     }
-
-	public String getOrganId() {
-		return organId;
-	}
-
-	public void setOrganId(String organId) {
-		this.organId = organId;
-	}
 }

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

@@ -81,7 +81,7 @@
         <where>
                 del_flag_ != 1
             <if test="search != null">
-                AND FIND_IN_SET(organ_id_,#{search})
+                AND (id_ LIKE CONCAT('%',#{search},'%') OR name_ LIKE CONCAT('%',#{search},'%'))
             </if>
 	        <if test="organId != null">
 	            AND FIND_IN_SET(organ_id_,#{organId})

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

@@ -79,15 +79,16 @@
             <if test="delFlag != null">
                 and o.del_flag_ = #{delFlag,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
             </if>
-            <if test="organId != null">
-                and o.id_ in (${organId})
+            <if test="search != null">
+                AND (o.id_ LIKE CONCAT('%',#{search},'%') OR o.name_ LIKE CONCAT('%',#{search},'%') OR o.address_ LIKE CONCAT('%',#{search},'%'))
             </if>
         </where>
     </sql>
 
     <!-- 分页查询 -->
     <select id="queryPage" resultMap="Organization" parameterType="map">
-        SELECT o.*,sa.name_ area_name_ FROM organization o LEFT JOIN sys_area sa ON o.area_id_ = sa.id_
+        SELECT o.*,sa.name_ area_name_ FROM organization o
+        LEFT JOIN sys_area sa ON o.area_id_ = sa.id_
         <include refid="queryPageSql"/>
          ORDER BY id_
         <include refid="global.limit"/>

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

@@ -1,30 +1,19 @@
 package com.ym.mec.web.controller;
 
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
-
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
-import com.ym.mec.biz.dal.dao.EmployeeDao;
-import com.ym.mec.biz.dal.entity.Employee;
 import com.ym.mec.biz.dal.entity.Organization;
 import com.ym.mec.biz.dal.page.OrganizationQueryInfo;
 import com.ym.mec.biz.service.OrganizationService;
 import com.ym.mec.common.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Date;
 
 @RequestMapping("organization")
 @Api(tags = "分部服务")
@@ -35,8 +24,6 @@ public class OrganizationController extends BaseController {
     private OrganizationService organizationService;
 	@Autowired
 	private SysUserFeignService sysUserFeignService;
-	@Autowired
-	private EmployeeDao employeeDao;
 
     @ApiOperation(value = "分页查询分部列表")
     @GetMapping("/queryPage")
@@ -46,7 +33,7 @@ public class OrganizationController extends BaseController {
 		if (sysUser == null) {
 			return failed("用户信息获取失败");
 		}
-		if(!sysUser.getIsSuperAdmin()){
+		/*if(!sysUser.getIsSuperAdmin()){
 			Employee employee = employeeDao.get(sysUser.getId());
 			if (StringUtils.isEmpty(queryInfo.getOrganId())) {
 				queryInfo.setOrganId(employee.getOrganIdList());
@@ -58,7 +45,7 @@ public class OrganizationController extends BaseController {
 					return failed("非法请求");
 				}
 			}
-		}
+		}*/
         return succeed(organizationService.queryPage(queryInfo));
     }