Merge branch 'master' of googol/YY_BE_2 into develop

.gitignore

@@ -60,3 +60,6 @@ gen_code
 
 ### node ###
 node_modules
+
+### oneself ###
+.idea/

hnqz-auth/src/main/resources/bootstrap.yml

@@ -7,10 +7,13 @@ spring:
   cloud:
     nacos:
       discovery:
-        server-addr: ${NACOS_HOST:hnqz-register}:${NACOS_PORT:8848}
+        #server-addr: ${NACOS_HOST:hnqz-register}:${NACOS_PORT:8848}
+        server-addr: ${NACOS_HOST:innetnacos.yaoyi.net}
+        namespace: @profiles.namespace@
       config:
         server-addr: ${spring.cloud.nacos.discovery.server-addr}
         file-extension: yml
+        namespace: @profiles.namespace@
         shared-configs:
           - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
   profiles:

hnqz-gateway/src/main/resources/bootstrap.yml

@@ -7,10 +7,13 @@ spring:
   cloud:
     nacos:
       discovery:
-        server-addr: ${NACOS_HOST:hnqz-register}:${NACOS_PORT:8848}
+        #server-addr: ${NACOS_HOST:hnqz-register}:${NACOS_PORT:8848}
+        server-addr: ${NACOS_HOST:innetnacos.yaoyi.net}
+        namespace: @profiles.namespace@
       config:
         server-addr: ${spring.cloud.nacos.discovery.server-addr}
         file-extension: yml
+        namespace: @profiles.namespace@
         shared-configs:
           - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
   profiles:

hnqz-upms/hnqz-upms-biz/src/main/resources/bootstrap.yml

@@ -7,10 +7,13 @@ spring:
   cloud:
     nacos:
       discovery:
-        server-addr: ${NACOS_HOST:hnqz-register}:${NACOS_PORT:8848}
+        #server-addr: ${NACOS_HOST:hnqz-register}:${NACOS_PORT:8848}
+        server-addr: ${NACOS_HOST:innetnacos.yaoyi.net}
+        namespace: @profiles.namespace@
       config:
         server-addr: ${spring.cloud.nacos.discovery.server-addr}
         file-extension: yml
+        namespace: @profiles.namespace@
         shared-configs:
           - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
   autoconfigure:

hnqz-visual/hnqz-daemon-quartz/src/main/java/com/qunzhixinxi/hnqz/daemon/quartz/service/impl/WmStatisticsServiceImpl.java

@@ -369,7 +369,9 @@ public class WmStatisticsServiceImpl implements WmStatisticsService {
 			// 根据父企业名称查询dept
 			List<SysDept> parentDepts = sysDeptService.list(Wrappers.<SysDept>lambdaQuery().eq(SysDept::getName, parentDeptName));
 			// 根据子企业名称查询dept
-			List<SysDept> subDepts = sysDeptService.list(Wrappers.<SysDept>lambdaQuery().in(SysDept::getName, subDeptNames));
+			List<SysDept> subDepts = sysDeptService.listAllDept().stream()
+					.filter(sysDept -> subDeptNames.contains(sysDept.getName()))
+					.collect(Collectors.toList());
 
 			if (CollectionUtil.isNotEmpty(parentDepts) && CollectionUtil.isNotEmpty(subDepts)) {
 				Integer parentDeptId = parentDepts.get(0).getDeptId();

hnqz-visual/hnqz-daemon-quartz/src/main/resources/bootstrap.yml

@@ -10,10 +10,13 @@ spring:
   cloud:
     nacos:
       discovery:
-        server-addr: ${NACOS_HOST:hnqz-register}:${NACOS_PORT:8848}
+        #server-addr: ${NACOS_HOST:hnqz-register}:${NACOS_PORT:8848}
+        server-addr: ${NACOS_HOST:innetnacos.yaoyi.net}
+        namespace: @profiles.namespace@
       config:
         server-addr: ${spring.cloud.nacos.discovery.server-addr}
         file-extension: yml
+        namespace: @profiles.namespace@
         shared-configs:
           - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
   profiles:

hnqz-visual/hnqz-oa-platform/hnqz-oa-platform.iml

@@ -9,7 +9,9 @@
     <facet type="jpa" name="JPA">
       <configuration>
         <setting name="validation-enabled" value="true" />
-        <datasource-mapping />
+        <datasource-mapping>
+          <factory-entry name="hnqz-oa-platform" />
+        </datasource-mapping>
         <naming-strategy-map />
       </configuration>
     </facet>

pom.xml

@@ -266,6 +266,7 @@
 			<properties>
 				<!-- 环境标识，需要与配置文件的名称相对应 -->
 				<profiles.active>dev</profiles.active>
+				<profiles.namespace>639c1543-7221-46c9-a3ab-8993a6c44b19</profiles.namespace>
 			</properties>
 			<activation>
 				<!-- 默认环境 -->
@@ -276,12 +277,14 @@
 			<id>test</id>
 			<properties>
 				<profiles.active>test</profiles.active>
+				<profiles.namespace>dad4fedb-3a24-4560-b6cf-d9aafa3adc71</profiles.namespace>
 			</properties>
 		</profile>
 		<profile>
-			<id>prod</id>
+			<id>pro</id>
 			<properties>
-				<profiles.active>prod</profiles.active>
+				<profiles.active>pro</profiles.active>
+				<profiles.namespace>e2658ecc-4abf-418e-bd91-6e8366fd0912</profiles.namespace>
 			</properties>
 		</profile>
 	</profiles>