修改代码

amos-boot-module/amos-boot-module-api/amos-boot-module-patrol-api/src/main/java/com/yeejoin/amos/patrol/dao/entity/Point.java

@@ -43,14 +43,6 @@ public class Point extends BasicEntity {
 	 */
 	private String coordinates;
 
-	public String getIsSccreen() {
-		return isSccreen;
-	}
-
-	public void setIsSccreen(String isSccreen) {
-		this.isSccreen = isSccreen;
-	}
-
 	/**
 	 * 创建用户id
 	 */
@@ -236,9 +228,6 @@ public class Point extends BasicEntity {
 
 	private String ue4Location;
 
-	//bizOrgCode是否筛选字段,默认是1 为0时代表是前端传递进来的 数据库字段取值为eq 同级查找
-	private String isSccreen = "1";
-
 	/**
 	 * ue4旋转
 	 */

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/PointController.java

@@ -1107,9 +1107,7 @@ public class PointController extends AbstractBaseController {
 			return CommonResponseUtil.failure("用户session过期");
 		}
 		try {
-			if (!StringUtils.isEmpty(point.getBizOrgCode())){
-				point.setIsSccreen("0");
-			}else {
+			if (StringUtils.isEmpty(point.getBizOrgCode())){
 				point.setBizOrgCode(reginParams.getPersonIdentity().getCompanyBizOrgCode());
 			}
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/config/PersonIdentifyAspect.java

@@ -50,7 +50,7 @@ public class PersonIdentifyAspect {
     public void personIdentity(JoinPoint joinPoint) throws PermissionException {
         ReginParams reginParam = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
         if (reginParam != null ) {
-           if(reginParam.getPersonIdentity()==null){
+           if(reginParam.getPersonIdentity()==null || reginParam.getPersonIdentity().getCompanyBizOrgCode()==null){
                 String userId = reginParam.getUserModel().getUserId();
 
                 if(userId!=null){

amos-boot-system-patrol/src/main/resources/db/mapper/pointMapper.xml

@@ -98,10 +98,7 @@
 			<if test="pointParams.catalogId != null and pointParams.catalogId != ''">
 				and p.catalog_id = #{pointParams.catalogId}
 			</if>
-			<if test="pointParams.bizOrgCode != null and pointParams.bizOrgCode != '' and pointParams.isSccreen == '0'">
-				and p.biz_org_code = #{pointParams.bizOrgCode}
-			</if>
-			<if test="pointParams.bizOrgCode != null and pointParams.bizOrgCode != '' and pointParams.isSccreen == '1'">
+			<if test="pointParams.bizOrgCode != null and pointParams.bizOrgCode != ''">
 				and p.biz_org_code  LIKE CONCAT (#{pointParams.bizOrgCode} ,'%')
 			</if>
 		</where>
@@ -126,10 +123,8 @@
 			<if test="catalogId != null and catalogId != ''">
 				and catalog_id = #{catalogId}
 			</if>
-			<if test="bizOrgCode != null and bizOrgCode != '' and isSccreen == '0'">
-				and biz_org_code = #{bizOrgCode}
-			</if>
-			<if test="bizOrgCode != null and bizOrgCode != '' and isSccreen == '1'">
+
+			<if test="bizOrgCode != null and bizOrgCode != ''">
 				and biz_org_code  LIKE CONCAT (#{bizOrgCode} ,'%')
 			</if>
 		</where>