--no commit message

com.zrqx.sysuser/src/main/java/com/zrqx/sysuser/bg/mapper/resource/VideoLibraryMapper.java

@@ -25,7 +25,7 @@ public interface VideoLibraryMapper extends BaseMapper<VideoLibrary> {
 			+ "from res_Video_Library a " + "left join sys_user user on a.userId = user.userid "
 			+ "LEFT JOIN sys_user_department ud ON a.userid = ud.userid "
 			+ "LEFT JOIN sys_department d ON ud.departmentid = d.departmentid "
-			+ "where 1=1  AND d.departmentName LIKE '%采集点%' " + "<if test='" + NOTBLANK + "(id)'>"
+			+ "where 1=1  AND d.departmentName LIKE '%手语采集%' " + "<if test='" + NOTBLANK + "(id)'>"
 			+ " and a.id = #{id} " + "</if>" + "</script>")
 	VideoLibraryOneVO queryById(@Param("id") String id);
 

com.zrqx.sysuser/src/main/java/com/zrqx/sysuser/bg/mapper/user/UserMapper.java

@@ -60,10 +60,10 @@ public interface UserMapper extends BaseMapper<User> {
 		    + "and u.username like concat('%',#{form.userName },'%') "
 		    + "</if>" 
 		    + "<if test= '"+NOTBLANK+"(form.phone)'>"    
-		    + "and u.phone like concat(#{form.phone},'%')"
+		    + "and u.phone like concat(#{form.phone},'%') "
 		    + "</if>" 
 		    + "<if test= '"+NOTBLANK+"(form.userId)'>"   
-		    + "and u.userId = #{form.userId}"
+		    + "and u.userId = #{form.userId} "
 		    + "</if>" 
 		    + "<if test='form.deptId != null'>"  
 		    + "and ud.departmentId = #{form.deptId} "

com.zrqx.sysuser/src/main/java/com/zrqx/sysuser/bg/service/content/SignLanguageServiceImpl.java

@@ -2,7 +2,6 @@ package com.zrqx.sysuser.bg.service.content;
 
 import java.util.Date;
 import java.util.List;
-import java.util.stream.Collectors;
 
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -145,13 +144,13 @@ public class SignLanguageServiceImpl extends BaseServiceImpl<SignLanguage, Strin
 						li.setStatus(SignStatusEnum.NOT_REVIEW.getCode());
 						li.setCompleteTime(null);
 					}else {
-						example2 = userRelationService.createExample();
+						/*example2 = userRelationService.createExample();
 						example2.createCriteria().andEqualTo("objectId", li.getId()).andEqualTo("area_adminId",redis.getUser().getArea_adminId()).andEqualTo("status", SignStatusEnum.YES_STAY.getCode());
 						num = userRelationService.selectCountByExample(example2);
 						if(num>0) {
 							li.setStatus(SignStatusEnum.YES_STAY.getCode());
 							//li.setCompleteTime(null);
-						}else {
+						}else {*/
 							example2 = userRelationService.createExample();
 							example2.createCriteria().andEqualTo("objectId", li.getId()).andEqualTo("area_adminId",redis.getUser().getArea_adminId()).andEqualTo("status", SignStatusEnum.NOT_ADOPT.getCode());
 							num = userRelationService.selectCountByExample(example2);
@@ -160,7 +159,7 @@ public class SignLanguageServiceImpl extends BaseServiceImpl<SignLanguage, Strin
 								li.setCompleteTime(null);
 							}
 						}
-					}
+					/*}*/
 				}
 				//获取任务状态
 				if(li.getStatus().equals(SignStatusEnum.YES_STAY.getCode())) {

com.zrqx.sysuser/src/main/java/com/zrqx/sysuser/bg/service/user/UserServiceImpl.java

@@ -104,7 +104,7 @@ public class UserServiceImpl extends BaseServiceImpl<User, String> implements Us
 					if (user.getDeptId() != null && user.getDeptId().size() > 0) {
 						for (Integer deptId : user.getDeptId()) {
 							Department dept = deptMapper.selectByPrimaryKey(deptId);
-							if (dept == null || !dept.getDepartmentName().contains("采集点")) {
+							if (dept == null || !dept.getDepartmentName().contains("手语采集")) {
 								continue;
 							}
 							list = udMapper.getAreaAdminByDeptId(deptId);