Merge branch 'dev_externalappauth' into dev_temp

# Conflicts:
#	epmet-auth/pom.xml
#	epmet-gateway/pom.xml
#	epmet-module/epmet-common-service/common-service-server/pom.xml
#	epmet-module/epmet-ext/epmet-ext-server/pom.xml
#	epmet-module/epmet-heart/epmet-heart-server/pom.xml
#	epmet-module/gov-access/gov-access-server/pom.xml
#	epmet-module/gov-mine/gov-mine-server/pom.xml
#	epmet-module/gov-org/gov-org-server/pom.xml
#	epmet-module/oper-access/oper-access-server/pom.xml
#	epmet-module/oper-crm/oper-crm-server/pom.xml
#	epmet-module/oper-customize/oper-customize-server/pom.xml
#	epmet-module/resi-partymember/resi-partymember-server/pom.xml
#	epmet-user/epmet-user-server/pom.xml

epmet-auth/deploy/docker-compose-prod.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-auth-server:
     container_name: epmet-auth-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-auth:0.3.68
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-auth:0.3.69
     ports:
       - "8081:8081"
     network_mode: host # 使用现有网络

epmet-gateway/deploy/docker-compose-prod.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-gateway-server:
     container_name: epmet-gateway-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-gateway:0.3.30
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-gateway:0.3.33
     ports:
       - "8080:8080"
     network_mode: host # 使用现有网络

epmet-gateway/pom.xml

@@ -182,7 +182,7 @@
 <!--                <gateway.routes.data-report-server.uri>http://localhost:8109</gateway.routes.data-report-server.uri>-->
                 <!-- 29、统计服务 -->
                 <gateway.routes.data-statistical-server.uri>lb://data-statistical-server</gateway.routes.data-statistical-server.uri>
-                <!--<gateway.routes.data-statistical-server.uri>http://localhost:8108</gateway.routes.data-statistical-server.uri>-->
+           <!--     <gateway.routes.data-statistical-server.uri>http://localhost:8108</gateway.routes.data-statistical-server.uri>-->
                 <!-- 30、内容审核服务 -->
                 <gateway.routes.epmet-openapi-scan.uri>lb://epmet-openapi-scan</gateway.routes.epmet-openapi-scan.uri>
            <!--     <gateway.routes.epmet-openapi-scan.uri>http://localhost:8107</gateway.routes.epmet-openapi-scan.uri>-->

epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/dto/form/ExternalAppFormDTO.java

@@ -20,6 +20,15 @@ public class ExternalAppFormDTO {
     @NotBlank(message = "缺少所属客户ID", groups = { AddExternalApp.class, UpdateExternalApp.class })
     private String customerId;
 
+    /**
+     * 客户类型
+     * external:外部
+     * internal:内部
+     */
+    @NotBlank(message = "缺少客户类型", groups = { AddExternalApp.class, UpdateExternalApp.class })
+    private String customerType;
+
+
     private Integer pageNo = 1;
     private Integer pageSize = 10;
 

epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/dto/result/ExternalAppResultDTO.java

@@ -21,6 +21,10 @@ public class ExternalAppResultDTO {
      */
     private String customerName;
 
+    private String customerType;
+
+    private String customerTypeName;
+
     /**
      * 秘钥
      */

epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-prod.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   common-service-server:
     container_name: common-service-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/common-service-server:0.3.9
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/common-service-server:0.3.17
     ports:
       - "8103:8103"
     network_mode: host # 使用现有网络

epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/controller/ExternalAppController.java

@@ -66,8 +66,9 @@ public class ExternalAppController {
 
         String appName = formDTO.getAppName();
         String customerId = formDTO.getCustomerId();
+        String customerType = formDTO.getCustomerType();
 
-        ExternalAppResultDTO dto = externalAppService.add(appName, customerId);
+        ExternalAppResultDTO dto = externalAppService.add(appName, customerId, customerType);
         return new Result<ExternalAppResultDTO>().ok(dto);
     }
 
@@ -84,8 +85,9 @@ public class ExternalAppController {
         String appId = formDTO.getAppId();
         String appName = formDTO.getAppName();
         String customerId = formDTO.getCustomerId();
+        String customerType = formDTO.getCustomerType();
 
-        ExternalAppResultDTO dto = externalAppService.updateById(appId, appName, customerId);
+        ExternalAppResultDTO dto = externalAppService.updateById(appId, appName, customerId, customerType);
         return new Result<ExternalAppResultDTO>().ok(dto);
     }
 

epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/entity/ExternalAppEntity.java

@@ -48,4 +48,6 @@ public class ExternalAppEntity extends BaseEpmetEntity {
 	 */
 	private String customerId;
 
+	private String customerType;
+
 }

epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/enu/CustomerTypeEnum.java

@@ -0,0 +1,41 @@
+package com.epmet.enu;
+
+import org.apache.commons.lang3.StringUtils;
+
+/**
+ * 客户类型枚举
+ */
+public enum CustomerTypeEnum {
+
+    INTERNAL("internal", "内部客户"),
+    EXTERNAL("external", "外部客户"),
+    UN_KNOW("unknow", "未知类型");
+
+    private String type;
+    private String name;
+
+    CustomerTypeEnum(String type, String name) {
+        this.type = type;
+        this.name = name;
+    }
+
+    public static String getName(String type) {
+        if (StringUtils.isBlank(type)) {
+            return null;
+        }
+        for (CustomerTypeEnum value : CustomerTypeEnum.values()) {
+            if (value.type.equals(type)) {
+                return value.name;
+            }
+        }
+        return UN_KNOW.name;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public String getName() {
+        return name;
+    }
+}

epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/ExternalAppService.java

@@ -29,9 +29,9 @@ import java.util.List;
  * @since v1.0.0 2020-08-18
  */
 public interface ExternalAppService {
-    ExternalAppResultDTO add(String appName, String customerId);
+    ExternalAppResultDTO add(String appName, String customerId, String customerType);
 
-    ExternalAppResultDTO updateById(String appId, String appName, String customerId);
+    ExternalAppResultDTO updateById(String appId, String appName, String customerId, String customerType);
 
     PageData<ExternalAppResultDTO> listPage(Integer pageNo, Integer pageSize, String customerId);
 

epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/ExternalAppServiceImpl.java

@@ -20,15 +20,21 @@ package com.epmet.service.impl;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.Result;
 import com.epmet.dao.ExternalAppDao;
 import com.epmet.dao.ExternalAppSecretDao;
 import com.epmet.dao.ExternalCustomerDao;
+import com.epmet.dto.CustomerDTO;
 import com.epmet.dto.result.ExternalAppResultDTO;
 import com.epmet.entity.ExternalAppEntity;
 import com.epmet.entity.ExternalAppSecretEntity;
+import com.epmet.enu.CustomerTypeEnum;
+import com.epmet.feign.OperCrmOpenFeignClient;
 import com.epmet.service.ExternalAppService;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -45,6 +51,8 @@ import java.util.UUID;
 @Service
 public class ExternalAppServiceImpl implements ExternalAppService {
 
+    private static Logger logger = LoggerFactory.getLogger(ExternalAppServiceImpl.class);
+
     @Autowired
     private ExternalAppDao externalAppDao;
 
@@ -54,24 +62,39 @@ public class ExternalAppServiceImpl implements ExternalAppService {
     @Autowired
     private ExternalCustomerDao externalCustomerDao;
 
+    @Autowired
+    private OperCrmOpenFeignClient operCrmOpenFeignClient;
+
     @Transactional
     @Override
-    public ExternalAppResultDTO add(String appName, String customerId) {
+    public ExternalAppResultDTO add(String appName, String customerId, String customerType) {
         Integer count = externalAppDao.countByAppNameAndCustomerId(appName, customerId);
         if (count > 0) {
             throw new RenException(EpmetErrorCode.OPER_EXTERNAL_APP_EXISTS.getCode(),
                     EpmetErrorCode.OPER_EXTERNAL_APP_EXISTS.getMsg());
         }
 
-        if (externalCustomerDao.selectById(customerId) == null) {
+        if (CustomerTypeEnum.EXTERNAL.getType().equals(customerType) && externalCustomerDao.selectById(customerId) == null) {
             throw new RenException(EpmetErrorCode.OPER_EXTERNAL_CUSTOMER_NOT_EXISTS.getCode(),
                     EpmetErrorCode.OPER_EXTERNAL_CUSTOMER_NOT_EXISTS.getMsg());
         }
 
+        if (CustomerTypeEnum.INTERNAL.getType().equals(customerType)) {
+            CustomerDTO form = new CustomerDTO();
+            form.setId(customerId);
+            Result<CustomerDTO> customerInfoRst = operCrmOpenFeignClient.getCustomerInfo(form);
+            if (customerInfoRst.success() && customerInfoRst.getData() == null) {
+                throw new RenException(EpmetErrorCode.OPER_EXTERNAL_CUSTOMER_NOT_EXISTS.getCode(),
+                        EpmetErrorCode.OPER_EXTERNAL_CUSTOMER_NOT_EXISTS.getMsg());
+            }
+
+        }
+
         // 应用表插入
         ExternalAppEntity appEntity = new ExternalAppEntity();
         appEntity.setAppName(appName);
         appEntity.setCustomerId(customerId);
+        appEntity.setCustomerType(customerType);
         externalAppDao.insert(appEntity);
 
         // 秘钥表插入
@@ -98,7 +121,7 @@ public class ExternalAppServiceImpl implements ExternalAppService {
     }
 
     @Override
-    public ExternalAppResultDTO updateById(String appId, String appName, String customerId) {
+    public ExternalAppResultDTO updateById(String appId, String appName, String customerId, String customerType) {
         ExternalAppEntity exists = externalAppDao.selectById(appId);
         if (exists == null) {
             throw new RenException(EpmetErrorCode.OPER_EXTERNAL_CUSTOMER_NOT_EXISTS.getCode(),
@@ -113,6 +136,7 @@ public class ExternalAppServiceImpl implements ExternalAppService {
 
         exists.setAppName(appName);
         exists.setCustomerId(customerId);
+        exists.setCustomerType(customerType);
         externalAppDao.updateById(exists);
 
         ExternalAppResultDTO resultDTO = new ExternalAppResultDTO();
@@ -126,6 +150,26 @@ public class ExternalAppServiceImpl implements ExternalAppService {
     public PageData<ExternalAppResultDTO> listPage(Integer pageNo, Integer pageSize, String customerId) {
         PageHelper.startPage(pageNo, pageSize);
         List<ExternalAppResultDTO> list = externalAppDao.list(customerId);
+        for (ExternalAppResultDTO app : list) {
+            // 设置客户类型中文
+            app.setCustomerTypeName(CustomerTypeEnum.getName(app.getCustomerType()));
+
+            if (CustomerTypeEnum.INTERNAL.getType().equals(app.getCustomerType())) {
+                // 如果是内部客户，那么需要去oper_crm库查询客户信息
+                CustomerDTO form = new CustomerDTO();
+                form.setId(app.getCustomerId());
+                Result<CustomerDTO> customerInfoRst = operCrmOpenFeignClient.getCustomerInfo(form);
+                if (! customerInfoRst.success()) {
+                    logger.error("common service->ExternalAppServiceImpl#listPage查询内部客户失败:{}", customerInfoRst.getInternalMsg());
+                    continue;
+                }
+                // 设置客户名称
+                CustomerDTO customerInfo = customerInfoRst.getData();
+                if (customerInfo != null) {
+                    app.setCustomerName(customerInfo.getCustomerName());
+                }
+            }
+        }
         PageInfo<ExternalAppResultDTO> pageInfo = new PageInfo<>(list);
         return new PageData<>(list, pageInfo.getTotal());
     }

epmet-module/epmet-common-service/common-service-server/src/main/resources/db/migration/V0.0.4__add_extcustomer_type.sql

@@ -0,0 +1 @@
+alter table external_app add column CUSTOMER_TYPE varchar(20) not null after CUSTOMER_ID;

epmet-module/epmet-common-service/common-service-server/src/main/resources/mapper/ExternalAppDao.xml

@@ -7,6 +7,7 @@
         <result property="id" column="ID"/>
         <result property="appName" column="APP_NAME"/>
         <result property="customerId" column="CUSTOMER_ID"/>
+        <result property="customerType" column="CUSTOMER_TYPE"/>
         <result property="delFlag" column="DEL_FLAG"/>
         <result property="revision" column="REVISION"/>
         <result property="createdBy" column="CREATED_BY"/>
@@ -33,10 +34,11 @@
         ea.APP_NAME,
         ea.CUSTOMER_ID,
         ec.CUSTOMER_NAME ,
+        ea.CUSTOMER_TYPE,
         eas.SECRET
         FROM
         external_app ea
-        INNER JOIN external_customer ec ON ( ea.CUSTOMER_ID = ec.ID )
+        LEFT JOIN external_customer ec ON ( ea.CUSTOMER_ID = ec.ID )
         LEFT JOIN external_app_secret eas ON (ea.ID = eas.APP_ID)
         <where>
             ea.DEL_FLAG = 0

epmet-module/epmet-ext/epmet-ext-server/deploy/docker-compose-dev.yml

@@ -10,6 +10,7 @@ services:
       - "/opt/epmet-cloud-logs/dev:/logs"
     environment:
       RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
+    restart: "unless-stopped"
     deploy:
       resources:
         limits:

epmet-module/epmet-ext/epmet-ext-server/deploy/docker-compose-prod.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-ext-server:
     container_name: epmet-ext-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-ext-server:0.0.1
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-ext-server:0.0.6
     ports:
       - "8113:8113"
     network_mode: host # 使用现有网络
@@ -10,6 +10,7 @@ services:
       - "/opt/epmet-cloud-logs/prod:/logs"
     environment:
       RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./app.jar"
+    restart: "unless-stopped"
     deploy:
       resources:
         limits:

epmet-module/epmet-ext/epmet-ext-server/deploy/docker-compose-test.yml

@@ -10,6 +10,7 @@ services:
       - "/opt/epmet-cloud-logs/test:/logs"
     environment:
       RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
+    restart: "unless-stopped"
     deploy:
       resources:
         limits:

epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-prod.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-heart-server:
     container_name: epmet-heart-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-heart-server:0.0.52
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-heart-server:0.0.53
     ports:
       - "8111:8111"
     network_mode: host # 使用现有网络

epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-prod.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-third-server:
     container_name: epmet-third-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-third-server:0.0.135
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-third-server:0.0.138
     ports:
       - "8110:8110"
     network_mode: host # 使用现有网络

epmet-module/epmet-third/epmet-third-server/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.0.136</version>
+    <version>0.0.138</version>
 
     <parent>
         <groupId>com.epmet</groupId>

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeServiceImpl.java

@@ -575,12 +575,12 @@ public class CodeServiceImpl implements CodeService {
 			//设置服务器域名
 			WxResult<WxMaModifyDomainResult> modifyDomain = wxMaCodeService.modifyDomain(authInfo.getAuthorizerAccessToken(), "set");
 			if (!modifyDomain.success()) {
-				throw new RenException(modifyDomain.getErrorCode(), modifyDomain.getErrorMsg());
+				log.error(modifyDomain.getErrorMsg());
 			}
 			//设置业务域名
 			WxResult<WxMaSetWebviewDomainResult> setWebviewDomain = wxMaCodeService.setWebviewDomain(authInfo.getAuthorizerAccessToken(), "set");
 			if (!setWebviewDomain.success()) {
-				throw new RenException(setWebviewDomain.getErrorCode(), setWebviewDomain.getErrorMsg());
+				log.error(modifyDomain.getErrorMsg());
 			}
 		});
 	}

epmet-module/epmet-third/epmet-third-server/src/main/resources/bootstrap.yml

@@ -123,6 +123,14 @@ third:
       - https://epmet-dev.elinkservice.cn
       - https://epmet-test.elinkservice.cn
     webviewDomain:
-      - udp://epmet-cloud.elinkservice.cn
+      - https://epmet-ext.elinkservice.cn
-      - udp://epmet-dev.elinkservice.cn
+      - https://epmet-ext1.elinkservice.cn
-      - udp://epmet-test.elinkservice.cn
+      - https://epmet-ext2.elinkservice.cn
+      - https://epmet-ext3.elinkservice.cn
+      - https://epmet-ext4.elinkservice.cn
+      - https://epmet-ext5.elinkservice.cn
+      - https://epmet-ext6.elinkservice.cn
+      - https://epmet-ext7.elinkservice.cn
+      - https://epmet-ext8.elinkservice.cn
+      - https://epmet-ext9.elinkservice.cn
+      - https://epmet-ext10.elinkservice.cn

epmet-module/gov-access/gov-access-server/deploy/docker-compose-prod.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   gov-access-server:
     container_name: gov-access-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-access-server:0.3.38
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-access-server:0.3.39
     ports:
       - "8099:8099"
     network_mode: host # 使用现有网络

epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-prod.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   gov-mine-server:
     container_name: gov-mine-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-mine-server:0.3.33
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-mine-server:0.3.34
     ports:
       - "8098:8098"
     network_mode: host # 使用现有网络

epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   gov-org-server:
     container_name: gov-org-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.83
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.88
     ports:
       - "8092:8092"
     network_mode: host # 使用现有网络

epmet-module/oper-access/oper-access-server/deploy/docker-compose-prod.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   oper-access-server:
     container_name: oper-access-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/oper-access-server:0.3.15
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/oper-access-server:0.3.18
     ports:
       - "8093:8093"
     network_mode: host # 使用现有网络

epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/feign/OperCrmOpenFeignClient.java

@@ -21,7 +21,8 @@ import java.util.List;
  * @author yinzuomei@elink-cn.com
  * @date 2020/6/4 13:25
  */
-@FeignClient(name = ServiceConstant.OPER_CRM_SERVER, fallback = OperCrmOpenFeignClientFallback.class)
+//@FeignClient(name = ServiceConstant.OPER_CRM_SERVER, fallback = OperCrmOpenFeignClientFallback.class)
+@FeignClient(name = ServiceConstant.OPER_CRM_SERVER, fallback = OperCrmOpenFeignClientFallback.class, url = "118.190.150.119:48080/api")
 public interface OperCrmOpenFeignClient {
 	/**
 	 * 获取客户信息

epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-prod.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   oper-crm-server:
     container_name: oper-crm-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/oper-crm-server:0.3.66
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/oper-crm-server:0.3.71
     ports:
       - "8090:8090"
     network_mode: host # 使用现有网络

epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-prod.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   oper-customize-server:
     container_name: oper-customize-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/oper-customize-server:0.3.26
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/oper-customize-server:0.3.43
     ports:
       - "8089:8089"
     network_mode: host # 使用现有网络

epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-prod.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   resi-partymember-server:
     container_name: resi-partymember-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-partymember-server:0.3.56
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-partymember-server:0.3.57
     ports:
       - "8096:8096"
     network_mode: host # 使用现有网络

epmet-user/epmet-user-server/deploy/docker-compose-prod.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-user-server:
     container_name: epmet-user-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.118
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.122
     ports:
       - "8087:8087"
     network_mode: host # 不会创建新的网络

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/StaffRoleDao.java

@@ -17,6 +17,7 @@
 
 package com.epmet.dao;
 
+import com.epmet.commons.mybatis.annotation.DataFilter;
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.commons.mybatis.entity.DataScope;
 import com.epmet.dto.StaffRoleDTO;