bug修改

mec-biz/src/main/java/com/ym/mec/biz/service/impl/EmployeeServiceImpl.java

@@ -29,8 +29,11 @@ import com.ym.mec.im.entity.GroupMember;
 import com.ym.mec.im.entity.GroupModel;
 import com.ym.mec.util.collection.MapUtil;
 import org.apache.commons.lang3.StringUtils;
+import org.redisson.api.RBucket;
+import org.redisson.api.RedissonClient;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.dao.DuplicateKeyException;
+import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.security.authentication.LockedException;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.stereotype.Service;
@@ -42,6 +45,7 @@ import java.util.*;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
 @Service
@@ -79,6 +83,8 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee> impl
     private SysEmployeePositionDao employeePositionDao;
     @Autowired
     private SysUserTenantService sysUserTenantService;
+    @Autowired
+    private RedissonClient redissonClient;
 
     @Override
     public BaseDAO<Integer, Employee> getDAO() {
@@ -95,6 +101,10 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee> impl
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void add(Employee employee) {
+        RBucket<String> bucket = redissonClient.getBucket("add_employee_lock" + employee.getPhone());
+        if (!bucket.trySet(employee.getPhone(), 1l, TimeUnit.SECONDS)) {
+            throw new BizException("请勿重复提交");
+        }
         SysUser user = teacherDao.getUserWithPhone(employee.getPhone());
         Integer tenantId = employee.getTenantId();
         if (user != null && user.getId() != null) {

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

@@ -178,7 +178,7 @@
 		<where>
 			 qu.tenant_id_ = #{tenantId}
 			<if test="search != null and search != ''">
-				qu.user_id_ = #{search} OR ria.username_ LIKE CONCAT('%',#{search},'%') OR ria.mobile_no_ LIKE CONCAT('%',#{search},'%')
+				AND (qu.user_id_ = #{search} OR ria.username_ LIKE CONCAT('%',#{search},'%') OR ria.mobile_no_ LIKE CONCAT('%',#{search},'%'))
 			</if>
 			<if test="activeId != null">
 				AND qu.active_id_ = #{activeId}

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

@@ -1,7 +1,5 @@
 package com.ym.mec.web.controller;
 
-import com.ym.mec.auth.api.client.SysUserFeignService;
-import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.entity.Organization;
 import com.ym.mec.biz.dal.page.OrganizationQueryInfo;
 import com.ym.mec.biz.service.OrganizationService;
@@ -24,17 +22,11 @@ public class OrganizationController extends BaseController {
 
     @Autowired
     private OrganizationService organizationService;
-	@Autowired
-	private SysUserFeignService sysUserFeignService;
 
     @ApiOperation(value = "分页查询分部列表")
     @GetMapping("/queryPage")
     @PreAuthorize("@pcs.hasPermissions('organization/queryPage')")
     public Object queryPage(OrganizationQueryInfo queryInfo){
-    	SysUser sysUser = sysUserFeignService.queryUserInfo();
-		if (sysUser == null) {
-			return failed("用户信息获取失败");
-		}
         return succeed(organizationService.queryPage(queryInfo));
     }