优化BUG 从业人员选择已有人员

src/main/java/com/zcloud/controller/beidou/BeidouController.java

@@ -319,6 +319,7 @@ public class BeidouController extends BaseController {
         if (!StringUtils.isEmpty(pd.getString("TRAFFIC_TYPE")) && pd.getString("TRAFFIC_TYPE").equals("1")) {
             // 营运车辆
             List<PageData> operatingList = operatingVehiclesService.operationVehicleList(pd.getString("CORPINFO_ID"));
+            operatingList = operatingList.stream().filter(data -> StringUtils.equals(data.getString("ISASSIGNED"), "0")).collect(Collectors.toList());
             page.setPd(pd);
             List<PageData> compassList = beidouService.list(page);
 

src/main/java/com/zcloud/controller/operatingvehicles/OperatingVehiclesController.java

@@ -30,6 +30,7 @@ import org.springframework.web.servlet.ModelAndView;
 
 import java.io.File;
 import java.util.*;
+import java.util.function.Predicate;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;

src/main/java/com/zcloud/controller/system/AppVersionManagerController.java

@@ -6,6 +6,7 @@ import com.zcloud.entity.PageData;
 import com.zcloud.service.system.VersionManagerService;
 import com.zcloud.util.*;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.apache.shiro.util.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -164,6 +165,9 @@ public class AppVersionManagerController extends BaseController {
 		PageData pd = new PageData();
 		pd = this.getPageData();
 		List<PageData>	varList = versionmanagerService.listAll(pd);	//列出VersionManager列表
+		if(CollectionUtils.isEmpty(varList)) {
+			varList.add(new PageData());
+		}
 		map.put("pd", varList.get(0));
 		map.put("result", errInfo);
 		return map;

src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java

@@ -1349,7 +1349,7 @@ public class UsersServiceImpl implements UsersService {
                 try {
                     FaceUtil.compareFace(pd.getString("USERAVATARURL"), pd.getString("USERAVATARURL"));
                 } catch (Exception e) {
-                    throw new Exception("人脸图像不符合要求，请重新上传");
+                    return ReturnMap.ok("1");
                 }
             }
         /*if (!IdcardUtils.validateCard(pd.getString("USER_ID_CARD"))) {

src/main/resources/mybatis/datasource/check/CheckRecordMapper.xml

@@ -210,7 +210,6 @@
 		order by IFNULL( f.CHECK_TIME, f.PERIODEND ) desc
 	</select>
 	<select id="datalistPage" parameterType="page" resultType="pd">
-
 		select
 			'1' LIST_TYPE,
 			f.LISTMANAGER_ID LIST_ID,
@@ -239,12 +238,8 @@
 		LEFT JOIN BUS_LISTMANAGER l ON l.LISTMANAGER_ID = f.LISTMANAGER_ID
 		LEFT JOIN SYS_USER su ON su.USER_ID = l.USER_ID
 		where f.ISDELETE = '0' and f.CORPINFO_ID = #{pd.CORPINFO_ID} and f.FINISHED='1'
-
 		<if test="pd.KEYWORDS != null and pd.KEYWORDS != ''">
-			and
+			and f.LIST_NAME LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
-				(
-					f.LIST_NAME LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
-				)
 		</if>
 		<if test="pd.LISTMANAGER_ID != null and pd.LISTMANAGER_ID != ''">
 			and
@@ -418,7 +413,7 @@
 		<if test="pd.KEYWORDS != null and pd.KEYWORDS != ''">
 			and
 			(
-			f.LIST_NAME LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
+			f.CUSTOM_NAME LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
 			)
 		</if>
 		<if test="pd.CUSTOM_ID != null and pd.CUSTOM_ID != ''">

src/main/resources/mybatis/datasource/freighttrailer/FreightTrailerMapper.xml

@@ -254,7 +254,7 @@
 			and f.BELONGING_DEPT LIKE CONCAT(CONCAT('%', #{pd.BELONGING_DEPT}),'%')
 		</if>
 		<if test="pd.DEPARTMENT_NAME != null and pd.DEPARTMENT_NAME != ''">
-			and de.NAME LIKE CONCAT(CONCAT('%', #{pd.DEPARTMENT_NAME}),'%')
+			and f.BELONGING_DEPT = #{pd.DEPARTMENT_NAME}
 		</if>
 		ORDER BY f.OPERATTIME DESC
 	</select>