Merge remote-tracking branch 'origin/master'

LOG_FILE_IS_UNDEFINED

@@ -3619,3 +3619,183 @@ Caused by: java.net.ConnectException: Connection refused: no further information
 2024-05-31 11:37:45.707 |  INFO 16800 | SpringApplicationShutdownHook [TID: N/A] com.alibaba.druid.pool.DruidDataSource   | {dataSource-1} closed
 2024-05-31 11:37:45.707 |  INFO 16800 | SpringApplicationShutdownHook [TID: N/A] c.b.d.d.DynamicRoutingDataSource         | dynamic-datasource all closed success,bye
 >>>>>>> 68b13836e9aff463da4eb9e8ecf33e2d17476cc6
+2024-05-31 20:07:05.038 |  INFO 16852 | main [TID: N/A] com.alibaba.nacos.common.remote.client   | [RpcClientFactory] create a new rpc client of 1fa96114-49a0-4d54-a0c1-a1c6ca4530de_config-0
+2024-05-31 20:07:05.084 |  INFO 16852 | main [TID: N/A] org.reflections.Reflections              | Reflections took 33 ms to scan 1 urls, producing 3 keys and 6 values
+2024-05-31 20:07:05.109 |  INFO 16852 | main [TID: N/A] org.reflections.Reflections              | Reflections took 13 ms to scan 1 urls, producing 4 keys and 9 values
+2024-05-31 20:07:05.123 |  INFO 16852 | main [TID: N/A] org.reflections.Reflections              | Reflections took 10 ms to scan 1 urls, producing 3 keys and 10 values
+2024-05-31 20:07:05.184 |  INFO 16852 | main [TID: N/A] org.reflections.Reflections              | Reflections took 56 ms to scan 331 urls, producing 0 keys and 0 values
+2024-05-31 20:07:05.196 |  INFO 16852 | main [TID: N/A] org.reflections.Reflections              | Reflections took 11 ms to scan 1 urls, producing 1 keys and 5 values
+2024-05-31 20:07:05.212 |  INFO 16852 | main [TID: N/A] org.reflections.Reflections              | Reflections took 13 ms to scan 1 urls, producing 1 keys and 7 values
+2024-05-31 20:07:05.227 |  INFO 16852 | main [TID: N/A] org.reflections.Reflections              | Reflections took 11 ms to scan 1 urls, producing 2 keys and 8 values
+2024-05-31 20:07:05.286 |  INFO 16852 | main [TID: N/A] org.reflections.Reflections              | Reflections took 55 ms to scan 331 urls, producing 0 keys and 0 values
+2024-05-31 20:07:05.287 |  INFO 16852 | main [TID: N/A] com.alibaba.nacos.common.remote.client   | [1fa96114-49a0-4d54-a0c1-a1c6ca4530de_config-0] RpcClient init label, labels = {module=config, Vipserver-Tag=null, source=sdk, Amory-Tag=null, Location-Tag=null, taskId=0, AppName=unknown}
+2024-05-31 20:07:05.288 |  INFO 16852 | main [TID: N/A] com.alibaba.nacos.common.remote.client   | [1fa96114-49a0-4d54-a0c1-a1c6ca4530de_config-0] Register server push request handler:com.alibaba.nacos.client.config.impl.ClientWorker$ConfigRpcTransportClient$$Lambda$454/1538849250
+2024-05-31 20:07:05.289 |  INFO 16852 | main [TID: N/A] com.alibaba.nacos.common.remote.client   | [1fa96114-49a0-4d54-a0c1-a1c6ca4530de_config-0] Register server push request handler:com.alibaba.nacos.client.config.impl.ClientWorker$ConfigRpcTransportClient$$Lambda$455/1788034018
+2024-05-31 20:07:05.290 |  INFO 16852 | main [TID: N/A] com.alibaba.nacos.common.remote.client   | [1fa96114-49a0-4d54-a0c1-a1c6ca4530de_config-0] Registry connection listener to current client:com.alibaba.nacos.client.config.impl.ClientWorker$ConfigRpcTransportClient$1
+2024-05-31 20:07:05.291 |  INFO 16852 | main [TID: N/A] com.alibaba.nacos.common.remote.client   | [1fa96114-49a0-4d54-a0c1-a1c6ca4530de_config-0] RpcClient init, ServerListFactory = com.alibaba.nacos.client.config.impl.ClientWorker$ConfigRpcTransportClient$2
+2024-05-31 20:07:05.303 |  INFO 16852 | main [TID: N/A] com.alibaba.nacos.common.remote.client   | [1fa96114-49a0-4d54-a0c1-a1c6ca4530de_config-0] Try to connect to server on start up, server: {serverIp = '10.10.10.7', server main port = 8848}
+2024-05-31 20:07:06.755 |  INFO 16852 | main [TID: N/A] com.alibaba.nacos.common.remote.client   | [1fa96114-49a0-4d54-a0c1-a1c6ca4530de_config-0] Success to connect to server [10.10.10.7:8848] on start up, connectionId = 1717157229468_10.10.8.154_61915
+2024-05-31 20:07:06.755 |  INFO 16852 | com.alibaba.nacos.client.remote.worker [TID: N/A] com.alibaba.nacos.common.remote.client   | [1fa96114-49a0-4d54-a0c1-a1c6ca4530de_config-0] Notify connected event to listeners.
+2024-05-31 20:07:06.756 |  INFO 16852 | main [TID: N/A] com.alibaba.nacos.common.remote.client   | [1fa96114-49a0-4d54-a0c1-a1c6ca4530de_config-0] Register server push request handler:com.alibaba.nacos.common.remote.client.RpcClient$ConnectResetRequestHandler
+2024-05-31 20:07:06.756 |  INFO 16852 | main [TID: N/A] com.alibaba.nacos.common.remote.client   | [1fa96114-49a0-4d54-a0c1-a1c6ca4530de_config-0] Register server push request handler:com.alibaba.nacos.common.remote.client.RpcClient$$Lambda$463/956856274
+2024-05-31 20:07:06.820 |  WARN 16852 | main [TID: N/A] c.a.c.n.c.NacosPropertySourceBuilder     | Ignore the empty nacos configuration and get it based on dataId[system-server] & group[DEFAULT_GROUP]
+2024-05-31 20:07:06.826 |  WARN 16852 | main [TID: N/A] c.a.c.n.c.NacosPropertySourceBuilder     | Ignore the empty nacos configuration and get it based on dataId[system-server.yaml] & group[DEFAULT_GROUP]
+2024-05-31 20:07:06.831 |  WARN 16852 | main [TID: N/A] c.a.c.n.c.NacosPropertySourceBuilder     | Ignore the empty nacos configuration and get it based on dataId[system-server-local.yaml] & group[DEFAULT_GROUP]
+2024-05-31 20:07:06.832 |  INFO 16852 | main [TID: N/A] b.c.PropertySourceBootstrapConfiguration | Located property source: [BootstrapPropertySource {name='bootstrapProperties-system-server-local.yaml,DEFAULT_GROUP'}, BootstrapPropertySource {name='bootstrapProperties-system-server.yaml,DEFAULT_GROUP'}, BootstrapPropertySource {name='bootstrapProperties-system-server,DEFAULT_GROUP'}]
+2024-05-31 20:07:06.851 |  INFO 16852 | main [TID: N/A] c.z.m.system.SystemServerApplication     | The following 1 profile is active: "local"
+2024-05-31 20:07:08.571 |  WARN 16852 | main [TID: N/A] o.m.s.mapper.ClassPathMapperScanner      | Skipping MapperFactoryBean with name 'companyMapper' and 'com.zjugis.module.system.dal.mysql.company.CompanyMapper' mapperInterface. Bean already defined with the same name!
+2024-05-31 20:07:08.571 |  WARN 16852 | main [TID: N/A] o.m.s.mapper.ClassPathMapperScanner      | Skipping MapperFactoryBean with name 'deptLeaderMapper' and 'com.zjugis.module.system.dal.mysql.dept.DeptLeaderMapper' mapperInterface. Bean already defined with the same name!
+2024-05-31 20:07:08.571 |  WARN 16852 | main [TID: N/A] o.m.s.mapper.ClassPathMapperScanner      | Skipping MapperFactoryBean with name 'deptMapper' and 'com.zjugis.module.system.dal.mysql.dept.DeptMapper' mapperInterface. Bean already defined with the same name!
+2024-05-31 20:07:08.572 |  WARN 16852 | main [TID: N/A] o.m.s.mapper.ClassPathMapperScanner      | Skipping MapperFactoryBean with name 'postMapper' and 'com.zjugis.module.system.dal.mysql.dept.PostMapper' mapperInterface. Bean already defined with the same name!
+2024-05-31 20:07:08.572 |  WARN 16852 | main [TID: N/A] o.m.s.mapper.ClassPathMapperScanner      | Skipping MapperFactoryBean with name 'userDeptMapper' and 'com.zjugis.module.system.dal.mysql.dept.UserDeptMapper' mapperInterface. Bean already defined with the same name!
+2024-05-31 20:07:08.572 |  WARN 16852 | main [TID: N/A] o.m.s.mapper.ClassPathMapperScanner      | Skipping MapperFactoryBean with name 'userPostMapper' and 'com.zjugis.module.system.dal.mysql.dept.UserPostMapper' mapperInterface. Bean already defined with the same name!
+2024-05-31 20:07:08.572 |  WARN 16852 | main [TID: N/A] o.m.s.mapper.ClassPathMapperScanner      | Skipping MapperFactoryBean with name 'dictDataMapper' and 'com.zjugis.module.system.dal.mysql.dict.DictDataMapper' mapperInterface. Bean already defined with the same name!
+2024-05-31 20:07:08.572 |  WARN 16852 | main [TID: N/A] o.m.s.mapper.ClassPathMapperScanner      | Skipping MapperFactoryBean with name 'dictTypeMapper' and 'com.zjugis.module.system.dal.mysql.dict.DictTypeMapper' mapperInterface. Bean already defined with the same name!
+2024-05-31 20:07:08.572 |  WARN 16852 | main [TID: N/A] o.m.s.mapper.ClassPathMapperScanner      | Skipping MapperFactoryBean with name 'districtMapper' and 'com.zjugis.module.system.dal.mysql.district.DistrictMapper' mapperInterface. Bean already defined with the same name!
+2024-05-31 20:07:08.572 |  WARN 16852 | main [TID: N/A] o.m.s.mapper.ClassPathMapperScanner      | Skipping MapperFactoryBean with name 'errorCodeMapper' and 'com.zjugis.module.system.dal.mysql.errorcode.ErrorCodeMapper' mapperInterface. Bean already defined with the same name!
+2024-05-31 20:07:08.572 |  WARN 16852 | main [TID: N/A] o.m.s.mapper.ClassPathMapperScanner      | Skipping MapperFactoryBean with name 'loginLogMapper' and 'com.zjugis.module.system.dal.mysql.logger.LoginLogMapper' mapperInterface. Bean already defined with the same name!
+2024-05-31 20:07:08.572 |  WARN 16852 | main [TID: N/A] o.m.s.mapper.ClassPathMapperScanner      | Skipping MapperFactoryBean with name 'operateLogMapper' and 'com.zjugis.module.system.dal.mysql.logger.OperateLogMapper' mapperInterface. Bean already defined with the same name!
+2024-05-31 20:07:08.572 |  WARN 16852 | main [TID: N/A] o.m.s.mapper.ClassPathMapperScanner      | Skipping MapperFactoryBean with name 'mailAccountMapper' and 'com.zjugis.module.system.dal.mysql.mail.MailAccountMapper' mapperInterface. Bean already defined with the same name!
+2024-05-31 20:07:08.572 |  WARN 16852 | main [TID: N/A] o.m.s.mapper.ClassPathMapperScanner      | Skipping MapperFactoryBean with name 'mailLogMapper' and 'com.zjugis.module.system.dal.mysql.mail.MailLogMapper' mapperInterface. Bean already defined with the same name!
+2024-05-31 20:07:08.575 |  WARN 16852 | main [TID: N/A] o.m.s.mapper.ClassPathMapperScanner      | Skipping MapperFactoryBean with name 'mailTemplateMapper' and 'com.zjugis.module.system.dal.mysql.mail.MailTemplateMapper' mapperInterface. Bean already defined with the same name!
+2024-05-31 20:07:08.575 |  WARN 16852 | main [TID: N/A] o.m.s.mapper.ClassPathMapperScanner      | Skipping MapperFactoryBean with name 'noticeMapper' and 'com.zjugis.module.system.dal.mysql.notice.NoticeMapper' mapperInterface. Bean already defined with the same name!
+2024-05-31 20:07:08.575 |  WARN 16852 | main [TID: N/A] o.m.s.mapper.ClassPathMapperScanner      | Skipping MapperFactoryBean with name 'notifyMessageMapper' and 'com.zjugis.module.system.dal.mysql.notify.NotifyMessageMapper' mapperInterface. Bean already defined with the same name!
+2024-05-31 20:07:08.575 |  WARN 16852 | main [TID: N/A] o.m.s.mapper.ClassPathMapperScanner      | Skipping MapperFactoryBean with name 'notifyTemplateMapper' and 'com.zjugis.module.system.dal.mysql.notify.NotifyTemplateMapper' mapperInterface. Bean already defined with the same name!
+2024-05-31 20:07:08.575 |  WARN 16852 | main [TID: N/A] o.m.s.mapper.ClassPathMapperScanner      | Skipping MapperFactoryBean with name 'OAuth2AccessTokenMapper' and 'com.zjugis.module.system.dal.mysql.oauth2.OAuth2AccessTokenMapper' mapperInterface. Bean already defined with the same name!
+2024-05-31 20:07:08.575 |  WARN 16852 | main [TID: N/A] o.m.s.mapper.ClassPathMapperScanner      | Skipping MapperFactoryBean with name 'OAuth2ApproveMapper' and 'com.zjugis.module.system.dal.mysql.oauth2.OAuth2ApproveMapper' mapperInterface. Bean already defined with the same name!
+2024-05-31 20:07:08.575 |  WARN 16852 | main [TID: N/A] o.m.s.mapper.ClassPathMapperScanner      | Skipping MapperFactoryBean with name 'OAuth2ClientMapper' and 'com.zjugis.module.system.dal.mysql.oauth2.OAuth2ClientMapper' mapperInterface. Bean already defined with the same name!
+2024-05-31 20:07:08.575 |  WARN 16852 | main [TID: N/A] o.m.s.mapper.ClassPathMapperScanner      | Skipping MapperFactoryBean with name 'OAuth2CodeMapper' and 'com.zjugis.module.system.dal.mysql.oauth2.OAuth2CodeMapper' mapperInterface. Bean already defined with the same name!
+2024-05-31 20:07:08.575 |  WARN 16852 | main [TID: N/A] o.m.s.mapper.ClassPathMapperScanner      | Skipping MapperFactoryBean with name 'OAuth2RefreshTokenMapper' and 'com.zjugis.module.system.dal.mysql.oauth2.OAuth2RefreshTokenMapper' mapperInterface. Bean already defined with the same name!
+2024-05-31 20:07:08.575 |  WARN 16852 | main [TID: N/A] o.m.s.mapper.ClassPathMapperScanner      | Skipping MapperFactoryBean with name 'menuMapper' and 'com.zjugis.module.system.dal.mysql.permission.MenuMapper' mapperInterface. Bean already defined with the same name!
+2024-05-31 20:07:08.575 |  WARN 16852 | main [TID: N/A] o.m.s.mapper.ClassPathMapperScanner      | Skipping MapperFactoryBean with name 'roleMapper' and 'com.zjugis.module.system.dal.mysql.permission.RoleMapper' mapperInterface. Bean already defined with the same name!
+2024-05-31 20:07:08.575 |  WARN 16852 | main [TID: N/A] o.m.s.mapper.ClassPathMapperScanner      | Skipping MapperFactoryBean with name 'roleMenuMapper' and 'com.zjugis.module.system.dal.mysql.permission.RoleMenuMapper' mapperInterface. Bean already defined with the same name!
+2024-05-31 20:07:08.575 |  WARN 16852 | main [TID: N/A] o.m.s.mapper.ClassPathMapperScanner      | Skipping MapperFactoryBean with name 'userRoleMapper' and 'com.zjugis.module.system.dal.mysql.permission.UserRoleMapper' mapperInterface. Bean already defined with the same name!
+2024-05-31 20:07:08.575 |  WARN 16852 | main [TID: N/A] o.m.s.mapper.ClassPathMapperScanner      | Skipping MapperFactoryBean with name 'sensitiveWordMapper' and 'com.zjugis.module.system.dal.mysql.sensitiveword.SensitiveWordMapper' mapperInterface. Bean already defined with the same name!
+2024-05-31 20:07:08.575 |  WARN 16852 | main [TID: N/A] o.m.s.mapper.ClassPathMapperScanner      | Skipping MapperFactoryBean with name 'smsChannelMapper' and 'com.zjugis.module.system.dal.mysql.sms.SmsChannelMapper' mapperInterface. Bean already defined with the same name!
+2024-05-31 20:07:08.575 |  WARN 16852 | main [TID: N/A] o.m.s.mapper.ClassPathMapperScanner      | Skipping MapperFactoryBean with name 'smsCodeMapper' and 'com.zjugis.module.system.dal.mysql.sms.SmsCodeMapper' mapperInterface. Bean already defined with the same name!
+2024-05-31 20:07:08.577 |  WARN 16852 | main [TID: N/A] o.m.s.mapper.ClassPathMapperScanner      | Skipping MapperFactoryBean with name 'smsLogMapper' and 'com.zjugis.module.system.dal.mysql.sms.SmsLogMapper' mapperInterface. Bean already defined with the same name!
+2024-05-31 20:07:08.577 |  WARN 16852 | main [TID: N/A] o.m.s.mapper.ClassPathMapperScanner      | Skipping MapperFactoryBean with name 'smsTemplateMapper' and 'com.zjugis.module.system.dal.mysql.sms.SmsTemplateMapper' mapperInterface. Bean already defined with the same name!
+2024-05-31 20:07:08.577 |  WARN 16852 | main [TID: N/A] o.m.s.mapper.ClassPathMapperScanner      | Skipping MapperFactoryBean with name 'socialUserBindMapper' and 'com.zjugis.module.system.dal.mysql.social.SocialUserBindMapper' mapperInterface. Bean already defined with the same name!
+2024-05-31 20:07:08.577 |  WARN 16852 | main [TID: N/A] o.m.s.mapper.ClassPathMapperScanner      | Skipping MapperFactoryBean with name 'socialUserMapper' and 'com.zjugis.module.system.dal.mysql.social.SocialUserMapper' mapperInterface. Bean already defined with the same name!
+2024-05-31 20:07:08.577 |  WARN 16852 | main [TID: N/A] o.m.s.mapper.ClassPathMapperScanner      | Skipping MapperFactoryBean with name 'adminUserMapper' and 'com.zjugis.module.system.dal.mysql.user.AdminUserMapper' mapperInterface. Bean already defined with the same name!
+2024-05-31 20:07:08.577 |  WARN 16852 | main [TID: N/A] o.m.s.mapper.ClassPathMapperScanner      | Skipping MapperFactoryBean with name 'messageInfoDao' and 'com.zjugis.module.system.framework.amqp.dao.MessageInfoDao' mapperInterface. Bean already defined with the same name!
+2024-05-31 20:07:08.577 |  WARN 16852 | main [TID: N/A] o.m.s.mapper.ClassPathMapperScanner      | No MyBatis mapper was found in '[com.zjugis.module.system]' package. Please check your configuration.
+2024-05-31 20:07:08.583 |  INFO 16852 | main [TID: N/A] faultConfiguringBeanFactoryPostProcessor | No bean named 'errorChannel' has been explicitly defined. Therefore, a default PublishSubscribeChannel will be created.
+2024-05-31 20:07:08.598 |  INFO 16852 | main [TID: N/A] faultConfiguringBeanFactoryPostProcessor | No bean named 'integrationHeaderChannelRegistry' has been explicitly defined. Therefore, a default DefaultHeaderChannelRegistry will be created.
+2024-05-31 20:07:08.676 |  INFO 16852 | main [TID: N/A] o.s.cloud.context.scope.GenericScope     | BeanFactory id=91fb95f7-c616-37e5-bd64-dd40ede54e47
+2024-05-31 20:07:09.084 |  INFO 16852 | main [TID: N/A] trationDelegate$BeanPostProcessorChecker | Bean 'com.zjugis.framework.datapermission.config.ZjugisDataPermissionAutoConfiguration' of type [com.zjugis.framework.datapermission.config.ZjugisDataPermissionAutoConfiguration] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-05-31 20:07:09.086 |  INFO 16852 | main [TID: N/A] trationDelegate$BeanPostProcessorChecker | Bean 'dataPermissionAnnotationAdvisor' of type [com.zjugis.framework.datapermission.core.aop.DataPermissionAnnotationAdvisor] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-05-31 20:07:09.093 |  INFO 16852 | main [TID: N/A] trationDelegate$BeanPostProcessorChecker | Bean 'org.springframework.cloud.stream.config.BindersHealthIndicatorAutoConfiguration' of type [org.springframework.cloud.stream.config.BindersHealthIndicatorAutoConfiguration] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-05-31 20:07:09.096 |  INFO 16852 | main [TID: N/A] trationDelegate$BeanPostProcessorChecker | Bean 'bindersHealthContributor' of type [org.springframework.cloud.stream.config.BindersHealthIndicatorAutoConfiguration$BindersHealthContributor] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-05-31 20:07:09.100 |  INFO 16852 | main [TID: N/A] trationDelegate$BeanPostProcessorChecker | Bean 'bindersHealthIndicatorListener' of type [org.springframework.cloud.stream.config.BindersHealthIndicatorAutoConfiguration$BindersHealthIndicatorListener] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-05-31 20:07:09.105 |  INFO 16852 | main [TID: N/A] trationDelegate$BeanPostProcessorChecker | Bean 'com.alibaba.cloud.stream.binder.rocketmq.autoconfigurate.ExtendedBindingHandlerMappingsProviderConfiguration' of type [com.alibaba.cloud.stream.binder.rocketmq.autoconfigurate.ExtendedBindingHandlerMappingsProviderConfiguration$$EnhancerBySpringCGLIB$$7ac8d26c] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-05-31 20:07:09.112 |  INFO 16852 | main [TID: N/A] trationDelegate$BeanPostProcessorChecker | Bean 'rocketExtendedPropertiesDefaultMappingsProvider' of type [com.alibaba.cloud.stream.binder.rocketmq.autoconfigurate.ExtendedBindingHandlerMappingsProviderConfiguration$$Lambda$668/276060674] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-05-31 20:07:09.117 |  INFO 16852 | main [TID: N/A] trationDelegate$BeanPostProcessorChecker | Bean 'org.springframework.cloud.stream.binder.rabbit.config.ExtendedBindingHandlerMappingsProviderConfiguration' of type [org.springframework.cloud.stream.binder.rabbit.config.ExtendedBindingHandlerMappingsProviderConfiguration$$EnhancerBySpringCGLIB$$1819bbf0] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-05-31 20:07:09.119 |  INFO 16852 | main [TID: N/A] trationDelegate$BeanPostProcessorChecker | Bean 'rabbitExtendedPropertiesDefaultMappingsProvider' of type [org.springframework.cloud.stream.binder.rabbit.config.ExtendedBindingHandlerMappingsProviderConfiguration$$Lambda$669/1043170851] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-05-31 20:07:09.124 |  INFO 16852 | main [TID: N/A] trationDelegate$BeanPostProcessorChecker | Bean 'BindingHandlerAdvise' of type [org.springframework.cloud.stream.config.BindingHandlerAdvise] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-05-31 20:07:09.125 |  INFO 16852 | main [TID: N/A] trationDelegate$BeanPostProcessorChecker | Bean 'org.springframework.cloud.commons.config.CommonsConfigAutoConfiguration' of type [org.springframework.cloud.commons.config.CommonsConfigAutoConfiguration] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-05-31 20:07:09.127 |  INFO 16852 | main [TID: N/A] trationDelegate$BeanPostProcessorChecker | Bean 'org.springframework.cloud.client.loadbalancer.LoadBalancerDefaultMappingsProviderAutoConfiguration' of type [org.springframework.cloud.client.loadbalancer.LoadBalancerDefaultMappingsProviderAutoConfiguration] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-05-31 20:07:09.128 |  INFO 16852 | main [TID: N/A] trationDelegate$BeanPostProcessorChecker | Bean 'loadBalancerClientsDefaultsMappingsProvider' of type [org.springframework.cloud.client.loadbalancer.LoadBalancerDefaultMappingsProviderAutoConfiguration$$Lambda$670/591827353] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-05-31 20:07:09.132 |  INFO 16852 | main [TID: N/A] trationDelegate$BeanPostProcessorChecker | Bean 'defaultsBindHandlerAdvisor' of type [org.springframework.cloud.commons.config.DefaultsBindHandlerAdvisor] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-05-31 20:07:09.138 |  INFO 16852 | main [TID: N/A] trationDelegate$BeanPostProcessorChecker | Bean 'spelConverter' of type [org.springframework.cloud.stream.config.SpelExpressionConverterConfiguration$SpelConverter] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-05-31 20:07:09.152 |  INFO 16852 | main [TID: N/A] trationDelegate$BeanPostProcessorChecker | Bean 'spring.datasource.dynamic-com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DynamicDataSourceProperties' of type [com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DynamicDataSourceProperties] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-05-31 20:07:09.156 |  INFO 16852 | main [TID: N/A] trationDelegate$BeanPostProcessorChecker | Bean 'com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DynamicDataSourceAutoConfiguration' of type [com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DynamicDataSourceAutoConfiguration$$EnhancerBySpringCGLIB$$8bc842a8] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-05-31 20:07:09.165 |  INFO 16852 | main [TID: N/A] trationDelegate$BeanPostProcessorChecker | Bean 'dsProcessor' of type [com.baomidou.dynamic.datasource.processor.DsHeaderProcessor] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-05-31 20:07:09.169 |  INFO 16852 | main [TID: N/A] trationDelegate$BeanPostProcessorChecker | Bean 'com.zjugis.framework.quartz.config.ZjugisAsyncAutoConfiguration' of type [com.zjugis.framework.quartz.config.ZjugisAsyncAutoConfiguration] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-05-31 20:07:09.498 |  INFO 16852 | main [TID: N/A] o.s.b.w.embedded.tomcat.TomcatWebServer  | Tomcat initialized with port(s): 48081 (http)
+2024-05-31 20:07:09.508 |  INFO 16852 | main [TID: N/A] o.apache.catalina.core.StandardService   | Starting service [Tomcat]
+2024-05-31 20:07:09.508 |  INFO 16852 | main [TID: N/A] org.apache.catalina.core.StandardEngine  | Starting Servlet engine: [Apache Tomcat/9.0.79]
+2024-05-31 20:07:09.793 |  INFO 16852 | main [TID: N/A] o.a.c.c.C.[Tomcat].[localhost].[/]       | Initializing Spring embedded WebApplicationContext
+2024-05-31 20:07:09.793 |  INFO 16852 | main [TID: N/A] w.s.c.ServletWebServerApplicationContext | Root WebApplicationContext: initialization completed in 2931 ms
+2024-05-31 20:07:10.762 |  INFO 16852 | main [TID: N/A] com.alibaba.druid.pool.DruidDataSource   | {dataSource-1,master} inited
+2024-05-31 20:07:10.808 |  INFO 16852 | main [TID: N/A] com.alibaba.druid.pool.DruidDataSource   | {dataSource-2,slave} inited
+2024-05-31 20:07:10.808 |  INFO 16852 | main [TID: N/A] c.b.d.d.DynamicRoutingDataSource         | dynamic-datasource - add a datasource named [slave] success
+2024-05-31 20:07:10.808 |  INFO 16852 | main [TID: N/A] c.b.d.d.DynamicRoutingDataSource         | dynamic-datasource - add a datasource named [master] success
+2024-05-31 20:07:10.808 |  INFO 16852 | main [TID: N/A] c.b.d.d.DynamicRoutingDataSource         | dynamic-datasource initial loaded [2] datasource,primary datasource named [master]
+2024-05-31 20:07:11.035 |  INFO 16852 | main [TID: N/A] o.s.c.openfeign.FeignClientFactoryBean   | For 'infra-server' URL not provided. Will try picking an instance via load-balancing.
+2024-05-31 20:07:11.126 |  INFO 16852 | main [TID: N/A] o.s.c.openfeign.FeignClientFactoryBean   | For 'system-server' URL not provided. Will try picking an instance via load-balancing.
+2024-05-31 20:07:11.919 |  INFO 16852 | main [TID: N/A] c.g.y.a.MybatisPlusJoinAutoConfiguration | MPJSqlInjector init
+2024-05-31 20:07:12.372 |  WARN 16852 | main [TID: N/A] c.b.m.core.metadata.TableInfoHelper      | This "id" is the table primary key by default name for `id` in Class: "com.zjugis.module.system.framework.amqp.entity.MessageInfo",So @TableField will not work!
+2024-05-31 20:07:12.931 |  INFO 16852 | main [TID: N/A] o.s.c.openfeign.FeignClientFactoryBean   | For 'infra-server' URL not provided. Will try picking an instance via load-balancing.
+2024-05-31 20:07:14.004 |  INFO 16852 | main [TID: N/A] org.redisson.Version                     | Redisson 3.18.0
+2024-05-31 20:07:14.401 |  INFO 16852 | redisson-netty-2-7 [TID: N/A] o.r.c.pool.MasterPubSubConnectionPool    | 1 connections initialized for 10.10.10.8/10.10.10.8:6379
+2024-05-31 20:07:14.463 |  INFO 16852 | redisson-netty-2-19 [TID: N/A] o.r.c.pool.MasterConnectionPool          | 24 connections initialized for 10.10.10.8/10.10.10.8:6379
+2024-05-31 20:07:15.260 |  INFO 16852 | main [TID: N/A] com.xingyuv.captcha.util.ImageUtils      | 自定义resource底图:[SLIDING_BLOCK=[Ljava.lang.String;@4f466207, ORIGINAL=[Ljava.lang.String;@121b7a95, PIC_CLICK=[Ljava.lang.String;@7aa62a90]
+2024-05-31 20:07:15.262 |  INFO 16852 | main [TID: N/A] c.x.c.s.impl.CaptchaServiceFactory       | supported-captchaCache-service:[redis, local]
+2024-05-31 20:07:15.266 |  INFO 16852 | main [TID: N/A] c.x.c.s.impl.CaptchaServiceFactory       | supported-captchaTypes-service:[clickWord, default, blockPuzzle]
+2024-05-31 20:07:15.266 |  INFO 16852 | main [TID: N/A] c.x.c.s.i.BlockPuzzleCaptchaServiceImpl  | --->>>xingyuv captcha-plus 初始化验证码底图<<<---blockPuzzle
+2024-05-31 20:07:15.364 |  INFO 16852 | main [TID: N/A] c.x.c.s.i.BlockPuzzleCaptchaServiceImpl  | 初始化local缓存...
+2024-05-31 20:07:16.552 |  INFO 16852 | main [TID: N/A] o.s.c.openfeign.FeignClientFactoryBean   | For 'infra-server' URL not provided. Will try picking an instance via load-balancing.
+2024-05-31 20:07:16.565 |  INFO 16852 | main [TID: N/A] o.s.c.openfeign.FeignClientFactoryBean   | For 'system-server' URL not provided. Will try picking an instance via load-balancing.
+2024-05-31 20:07:16.588 |  INFO 16852 | main [TID: N/A] o.s.c.openfeign.FeignClientFactoryBean   | For 'system-server' URL not provided. Will try picking an instance via load-balancing.
+2024-05-31 20:07:16.597 |  INFO 16852 | main [TID: N/A] c.z.f.dict.core.util.DictFrameworkUtils  | [init][初始化 DictFrameworkUtils 成功]
+2024-05-31 20:07:16.602 |  INFO 16852 | main [TID: N/A] c.z.f.j.c.ZjugisJacksonAutoConfiguration | [init][初始化 JsonUtils 成功]
+2024-05-31 20:07:16.605 |  INFO 16852 | main [TID: N/A] o.s.c.openfeign.FeignClientFactoryBean   | For 'system-server' URL not provided. Will try picking an instance via load-balancing.
+2024-05-31 20:07:17.176 |  INFO 16852 | main [TID: N/A] o.s.b.a.e.web.EndpointLinksResolver      | Exposing 25 endpoint(s) beneath base path '/actuator'
+2024-05-31 20:07:17.231 |  INFO 16852 | main [TID: N/A] o.s.s.web.DefaultSecurityFilterChain     | Will secure any request with [org.springframework.security.web.session.DisableEncodeUrlFilter@61f2bf3a, org.springframework.security.web.context.request.async.WebAsyncManagerIntegrationFilter@4a0dd851, org.springframework.security.web.context.SecurityContextPersistenceFilter@6792aa3e, org.springframework.security.web.header.HeaderWriterFilter@39d62e47, org.springframework.web.filter.CorsFilter@293dd4b3, org.springframework.security.web.authentication.logout.LogoutFilter@526a1b51, com.zjugis.framework.security.core.filter.TokenAuthenticationFilter@26d445e9, org.springframework.security.web.savedrequest.RequestCacheAwareFilter@7a8d6eb3, org.springframework.security.web.servletapi.SecurityContextHolderAwareRequestFilter@cc4a0dd, org.springframework.security.web.authentication.AnonymousAuthenticationFilter@25a81f28, org.springframework.security.web.session.SessionManagementFilter@88fe9a8, org.springframework.security.web.access.ExceptionTranslationFilter@4f5d587c, org.springframework.security.web.access.intercept.FilterSecurityInterceptor@4a648b35]
+2024-05-31 20:07:17.535 |  INFO 16852 | main [TID: N/A] o.s.c.s.m.DirectWithAttributesChannel    | Channel 'system-server-1.springCloudBusInput' has 1 subscriber(s).
+2024-05-31 20:07:17.545 |  INFO 16852 | main [TID: N/A] o.s.c.s.m.DirectWithAttributesChannel    | Channel 'system-server-1.smsSendConsumer-in-0' has 1 subscriber(s).
+2024-05-31 20:07:17.552 |  INFO 16852 | main [TID: N/A] o.s.c.s.m.DirectWithAttributesChannel    | Channel 'system-server-1.mailSendConsumer-in-0' has 1 subscriber(s).
+2024-05-31 20:07:18.170 |  WARN 16852 | main [TID: N/A] iguration$LoadBalancerCaffeineWarnLogger | Spring Cloud LoadBalancer is currently working with the default cache. While this cache implementation is useful for development and tests, it's recommended to use Caffeine cache in production.You can switch to using Caffeine cache, by adding it and org.springframework.cache.caffeine.CaffeineCacheManager to the classpath.
+2024-05-31 20:07:18.392 |  INFO 16852 | main [TID: N/A] o.s.i.endpoint.EventDrivenConsumer       | Adding {logging-channel-adapter:_org.springframework.integration.errorLogger} as a subscriber to the 'errorChannel' channel
+2024-05-31 20:07:18.392 |  INFO 16852 | main [TID: N/A] o.s.i.channel.PublishSubscribeChannel    | Channel 'system-server-1.errorChannel' has 1 subscriber(s).
+2024-05-31 20:07:18.392 |  INFO 16852 | main [TID: N/A] o.s.i.endpoint.EventDrivenConsumer       | started bean '_org.springframework.integration.errorLogger'
+2024-05-31 20:07:18.414 |  INFO 16852 | main [TID: N/A] com.alibaba.nacos.common.remote.client   | [RpcClientFactory] create a new rpc client of 25bd4466-9754-4525-9331-77a8c344cfd8
+2024-05-31 20:07:18.414 |  INFO 16852 | main [TID: N/A] com.alibaba.nacos.common.remote.client   | [25bd4466-9754-4525-9331-77a8c344cfd8] RpcClient init label, labels = {module=naming, source=sdk}
+2024-05-31 20:07:18.416 |  INFO 16852 | main [TID: N/A] com.alibaba.nacos.common.remote.client   | [25bd4466-9754-4525-9331-77a8c344cfd8] RpcClient init, ServerListFactory = com.alibaba.nacos.client.naming.core.ServerListManager
+2024-05-31 20:07:18.416 |  INFO 16852 | main [TID: N/A] com.alibaba.nacos.common.remote.client   | [25bd4466-9754-4525-9331-77a8c344cfd8] Registry connection listener to current client:com.alibaba.nacos.client.naming.remote.gprc.redo.NamingGrpcRedoService
+2024-05-31 20:07:18.417 |  INFO 16852 | main [TID: N/A] com.alibaba.nacos.common.remote.client   | [25bd4466-9754-4525-9331-77a8c344cfd8] Register server push request handler:com.alibaba.nacos.client.naming.remote.gprc.NamingPushRequestHandler
+2024-05-31 20:07:18.417 |  INFO 16852 | main [TID: N/A] com.alibaba.nacos.common.remote.client   | [25bd4466-9754-4525-9331-77a8c344cfd8] Try to connect to server on start up, server: {serverIp = '10.10.10.7', server main port = 8848}
+2024-05-31 20:07:18.532 |  INFO 16852 | main [TID: N/A] com.alibaba.nacos.common.remote.client   | [25bd4466-9754-4525-9331-77a8c344cfd8] Success to connect to server [10.10.10.7:8848] on start up, connectionId = 1717157241342_10.10.8.154_62019
+2024-05-31 20:07:18.532 |  INFO 16852 | com.alibaba.nacos.client.remote.worker [TID: N/A] com.alibaba.nacos.common.remote.client   | [25bd4466-9754-4525-9331-77a8c344cfd8] Notify connected event to listeners.
+2024-05-31 20:07:18.532 |  INFO 16852 | main [TID: N/A] com.alibaba.nacos.common.remote.client   | [25bd4466-9754-4525-9331-77a8c344cfd8] Register server push request handler:com.alibaba.nacos.common.remote.client.RpcClient$ConnectResetRequestHandler
+2024-05-31 20:07:18.532 |  INFO 16852 | main [TID: N/A] com.alibaba.nacos.common.remote.client   | [25bd4466-9754-4525-9331-77a8c344cfd8] Register server push request handler:com.alibaba.nacos.common.remote.client.RpcClient$$Lambda$463/956856274
+2024-05-31 20:07:18.705 |  INFO 16852 | main [TID: N/A] c.s.b.r.p.RabbitExchangeQueueProvisioner | declaring queue for inbound: springCloudBus.rocketmq-bus-group, bound to: springCloudBus
+2024-05-31 20:07:18.707 |  INFO 16852 | main [TID: N/A] o.s.a.r.c.CachingConnectionFactory       | Attempting to connect to: [10.10.10.7:5672]
+2024-05-31 20:07:18.750 |  INFO 16852 | main [TID: N/A] o.s.a.r.c.CachingConnectionFactory       | Created new connection: rabbitConnectionFactory#7793eaca:0/SimpleConnection@4873c645 [delegate=amqp://zjww@10.10.10.7:5672/platform3, localPort= 62020]
+2024-05-31 20:07:18.804 |  INFO 16852 | main [TID: N/A] o.s.c.stream.binder.BinderErrorChannel   | Channel 'springCloudBus.rocketmq-bus-group.errors' has 1 subscriber(s).
+2024-05-31 20:07:18.804 |  INFO 16852 | main [TID: N/A] o.s.c.stream.binder.BinderErrorChannel   | Channel 'springCloudBus.rocketmq-bus-group.errors' has 2 subscriber(s).
+2024-05-31 20:07:18.827 |  INFO 16852 | main [TID: N/A] o.s.i.a.i.AmqpInboundChannelAdapter      | started bean 'inbound.springCloudBus.rocketmq-bus-group'
+2024-05-31 20:07:18.855 |  INFO 16852 | main [TID: N/A] c.s.b.r.p.RabbitExchangeQueueProvisioner | declaring queue for inbound: system_sms_send.system_sms_send_consumer_group, bound to: system_sms_send
+2024-05-31 20:07:18.868 |  INFO 16852 | main [TID: N/A] o.s.c.stream.binder.BinderErrorChannel   | Channel 'system_sms_send.system_sms_send_consumer_group.errors' has 1 subscriber(s).
+2024-05-31 20:07:18.868 |  INFO 16852 | main [TID: N/A] o.s.c.stream.binder.BinderErrorChannel   | Channel 'system_sms_send.system_sms_send_consumer_group.errors' has 2 subscriber(s).
+2024-05-31 20:07:18.874 |  INFO 16852 | main [TID: N/A] o.s.i.a.i.AmqpInboundChannelAdapter      | started bean 'inbound.system_sms_send.system_sms_send_consumer_group'
+2024-05-31 20:07:18.898 |  INFO 16852 | main [TID: N/A] c.s.b.r.p.RabbitExchangeQueueProvisioner | declaring queue for inbound: system_mail_send.system_mail_send_consumer_group, bound to: system_mail_send
+2024-05-31 20:07:18.911 |  INFO 16852 | main [TID: N/A] o.s.c.stream.binder.BinderErrorChannel   | Channel 'system_mail_send.system_mail_send_consumer_group.errors' has 1 subscriber(s).
+2024-05-31 20:07:18.911 |  INFO 16852 | main [TID: N/A] o.s.c.stream.binder.BinderErrorChannel   | Channel 'system_mail_send.system_mail_send_consumer_group.errors' has 2 subscriber(s).
+2024-05-31 20:07:18.918 |  INFO 16852 | main [TID: N/A] o.s.i.a.i.AmqpInboundChannelAdapter      | started bean 'inbound.system_mail_send.system_mail_send_consumer_group'
+2024-05-31 20:07:18.930 |  INFO 16852 | main [TID: N/A] o.s.b.w.embedded.tomcat.TomcatWebServer  | Tomcat started on port(s): 48081 (http) with context path ''
+2024-05-31 20:07:18.940 |  INFO 16852 | main [TID: N/A] c.a.c.n.registry.NacosServiceRegistry    | nacos registry, DEFAULT_GROUP system-server 10.10.8.154:48081 register finished
+2024-05-31 20:07:19.139 |  INFO 16852 | nacos-grpc-client-executor-7 [TID: N/A] com.alibaba.nacos.common.remote.client   | [25bd4466-9754-4525-9331-77a8c344cfd8] Receive server push request, request = NotifySubscriberRequest, requestId = 353
+2024-05-31 20:07:19.142 |  INFO 16852 | nacos-grpc-client-executor-7 [TID: N/A] com.alibaba.nacos.common.remote.client   | [25bd4466-9754-4525-9331-77a8c344cfd8] Ack server push request, request = NotifySubscriberRequest, requestId = 353
+2024-05-31 20:07:19.206 |  INFO 16852 | main [TID: N/A] o.s.a.r.c.CachingConnectionFactory       | Attempting to connect to: [10.10.10.7:5672]
+2024-05-31 20:07:19.218 |  INFO 16852 | main [TID: N/A] o.s.a.r.c.CachingConnectionFactory       | Created new connection: rabbitConnectionFactory#768d27e8:0/SimpleConnection@1548dc37 [delegate=amqp://zjww@10.10.10.7:5672/platform3, localPort= 62023]
+2024-05-31 20:07:19.593 |  INFO 16852 | main [TID: N/A] c.z.m.system.SystemServerApplication     | Started SystemServerApplication in 16.247 seconds (JVM running for 16.868)
+2024-05-31 20:07:19.609 |  INFO 16852 | main [TID: N/A] c.a.c.n.refresh.NacosContextRefresher    | [Nacos Config] Listening config: dataId=system-server, group=DEFAULT_GROUP
+2024-05-31 20:07:19.609 |  INFO 16852 | main [TID: N/A] c.a.c.n.refresh.NacosContextRefresher    | [Nacos Config] Listening config: dataId=system-server.yaml, group=DEFAULT_GROUP
+2024-05-31 20:07:19.610 |  INFO 16852 | main [TID: N/A] c.a.c.n.refresh.NacosContextRefresher    | [Nacos Config] Listening config: dataId=system-server-local.yaml, group=DEFAULT_GROUP
+2024-05-31 20:07:20.601 |  INFO 16852 | pool-15-thread-1 [TID: N/A] c.z.f.b.core.BannerApplicationRunner     | 
+----------------------------------------------------------
+	项目启动成功！
+	
+2024-05-31 20:07:21.861 |  INFO 16852 | http-nio-48081-exec-1 [TID: N/A] o.a.c.c.C.[Tomcat].[localhost].[/]       | Initializing Spring DispatcherServlet 'dispatcherServlet'
+2024-05-31 20:07:21.861 |  INFO 16852 | http-nio-48081-exec-1 [TID: N/A] o.s.web.servlet.DispatcherServlet        | Initializing Servlet 'dispatcherServlet'
+2024-05-31 20:07:21.864 |  INFO 16852 | http-nio-48081-exec-1 [TID: N/A] o.s.web.servlet.DispatcherServlet        | Completed initialization in 3 ms
+2024-05-31 20:07:23.572 | DEBUG 16852 | http-nio-48081-exec-3 [TID: N/A] c.z.m.s.d.m.o.O.selectList               | ==>  Preparing: SELECT id,client_id,secret,name,logo,description,status,access_token_validity_seconds,refresh_token_validity_seconds,redirect_uris,authorized_grant_types,scopes,auto_approve_scopes,authorities,resource_ids,additional_information,create_time,update_time,creator,updater,deleted FROM system_oauth2_client WHERE deleted=0 AND (client_id = ?)
+2024-05-31 20:07:23.597 | DEBUG 16852 | http-nio-48081-exec-3 [TID: N/A] c.z.m.s.d.m.o.O.selectList               | ==> Parameters: workflow(String)
+2024-05-31 20:07:23.624 | DEBUG 16852 | http-nio-48081-exec-3 [TID: N/A] c.z.m.s.d.m.o.O.selectList               | <==      Total: 1
+2024-05-31 20:07:23.642 | DEBUG 16852 | http-nio-48081-exec-3 [TID: N/A] c.z.m.s.d.m.u.A.selectList               | ==>  Preparing: SELECT id,username,password,nickname,remark,dept_id,dept_name,dept_ids,post_ids,email,mobile,sex,avatar,status,login_ip,login_date,signature_url,create_time,update_time,creator,updater,deleted FROM system_users WHERE deleted=0 AND (username = ?)
+2024-05-31 20:07:23.642 | DEBUG 16852 | http-nio-48081-exec-3 [TID: N/A] c.z.m.s.d.m.u.A.selectList               | ==> Parameters: admin(String)
+2024-05-31 20:07:23.646 | DEBUG 16852 | http-nio-48081-exec-3 [TID: N/A] c.z.m.s.d.m.u.A.selectList               | <==      Total: 1
+2024-05-31 20:07:23.736 | DEBUG 16852 | http-nio-48081-exec-3 [TID: N/A] c.z.m.s.d.m.o.O.insert!selectKey         | ==>  Preparing: SELECT system_oauth2_access_token_seq.NEXTVAL FROM DUAL
+2024-05-31 20:07:23.736 | DEBUG 16852 | http-nio-48081-exec-3 [TID: N/A] c.z.m.s.d.m.o.O.insert!selectKey         | ==> Parameters: 
+2024-05-31 20:07:23.738 | DEBUG 16852 | http-nio-48081-exec-3 [TID: N/A] c.z.m.s.d.m.o.O.insert!selectKey         | <==      Total: 1
+2024-05-31 20:07:23.740 | DEBUG 16852 | http-nio-48081-exec-3 [TID: N/A] c.z.m.s.d.m.o.O.insert                   | ==>  Preparing: INSERT INTO system_oauth2_refresh_token ( id, refresh_token, user_id, user_type, client_id, scopes, expires_time, create_time, update_time, creator, updater ) VALUES ( ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ? )
+2024-05-31 20:07:23.821 | DEBUG 16852 | http-nio-48081-exec-3 [TID: N/A] c.z.m.s.d.m.o.O.insert                   | ==> Parameters: 13964(Long), 7ea460533f424ba0b22ef6b50a6b566f(String), dc794fe0-66fe-4b1d-9273-f747950b27c3(String), 2(Integer), workflow(String), ["user.read","user.write"](String), 2024-06-01T08:07:23.733(LocalDateTime), 2024-05-31T20:07:23.740(LocalDateTime), 2024-05-31T20:07:23.740(LocalDateTime), null, null
+2024-05-31 20:07:23.830 | DEBUG 16852 | http-nio-48081-exec-3 [TID: N/A] c.z.m.s.d.m.o.O.insert                   | <==    Updates: 1
+2024-05-31 20:07:23.831 | DEBUG 16852 | http-nio-48081-exec-3 [TID: N/A] c.z.m.s.d.m.o.O.insert!selectKey         | ==>  Preparing: SELECT system_oauth2_access_token_seq.NEXTVAL FROM DUAL
+2024-05-31 20:07:23.831 | DEBUG 16852 | http-nio-48081-exec-3 [TID: N/A] c.z.m.s.d.m.o.O.insert!selectKey         | ==> Parameters: 
+2024-05-31 20:07:23.832 | DEBUG 16852 | http-nio-48081-exec-3 [TID: N/A] c.z.m.s.d.m.o.O.insert!selectKey         | <==      Total: 1
+2024-05-31 20:07:23.833 | DEBUG 16852 | http-nio-48081-exec-3 [TID: N/A] c.z.m.s.d.m.o.O.insert                   | ==>  Preparing: INSERT INTO system_oauth2_access_token ( id, access_token, refresh_token, user_id, user_type, client_id, scopes, expires_time, create_time, update_time, creator, updater ) VALUES ( ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ? )
+2024-05-31 20:07:23.834 | DEBUG 16852 | http-nio-48081-exec-3 [TID: N/A] c.z.m.s.d.m.o.O.insert                   | ==> Parameters: 13965(Long), fce0ba3afa76471a89ac4a9266eb462a(String), 7ea460533f424ba0b22ef6b50a6b566f(String), dc794fe0-66fe-4b1d-9273-f747950b27c3(String), 2(Integer), workflow(String), ["user.read","user.write"](String), 2024-06-01T08:07:23.830(LocalDateTime), 2024-05-31T20:07:23.833(LocalDateTime), 2024-05-31T20:07:23.833(LocalDateTime), null, null
+2024-05-31 20:07:23.835 | DEBUG 16852 | http-nio-48081-exec-3 [TID: N/A] c.z.m.s.d.m.o.O.insert                   | <==    Updates: 1

client/src/api/login/index.ts

@@ -58,10 +58,6 @@ export const socialAuthRedirect = (type: number, redirectUri: string) => {
     url: '/system/auth/social-auth-redirect?type=' + type + '&redirectUri=' + redirectUri
   })
 }
-// 获取验证图片以及 token
-export const getCode = (data) => {
-  return request.postOriginal({ url: 'system/captcha/get', data })
-}
 
 // 滑动或者点选验证
 export const reqCheck = (data) => {

client/src/api/oa/workflow/index.ts

@@ -0,0 +1,31 @@
+import request from '@/config/axios'
+
+// 获取办件中心列表
+export const getHandlerCaseCenterList = (data) => {
+  return request.post(
+    { url: '/HandlerCaseCenter/list', data: data, headersType: 'application/form-data' },
+    '/workflow'
+  )
+}
+// 获取办件中心模板列表
+export const getFlowTemplateTree = () => {
+  return request.post({ url: '/TFlowTemplateApi/selectFlowTemplateTree' }, '/workflow')
+}
+// 获取办件中心汇总数据
+export const getHandlerCaseCenterCount = (data) => {
+  return request.post(
+    { url: '/HandlerCaseCenter/count', data: data, headersType: 'application/form-data' },
+    '/workflow'
+  )
+}
+// 获取办件中心新建办件模板
+export const getFlowTemplateTreeDataByUser = (data) => {
+  return request.post(
+    {
+      url: '/TFlowTemplate/GetFlowTemplateTreeDataByUser',
+      data: data,
+      headersType: 'application/form-data'
+    },
+    '/workflow'
+  )
+}

client/src/components/Verifition/src/Verify/VerifyPoints.vue

@@ -64,7 +64,7 @@
  * */
 import { resetSize } from './../utils/util'
 import { aesEncrypt } from './../utils/ase'
-import { getCode, reqCheck } from '@/api/login'
+import { reqCheck } from '@/api/login'
 import { getCurrentInstance, nextTick, onMounted, reactive, ref, toRefs } from 'vue'
 
 const props = defineProps({
@@ -130,7 +130,6 @@ const init = () => {
   fontPos.splice(0, fontPos.length)
   checkPosArr.splice(0, checkPosArr.length)
   num.value = 1
-  getPictrue()
   nextTick(() => {
     let { imgHeight, imgWidth, barHeight, barWidth } = resetSize(proxy)
     setSize.imgHeight = imgHeight
@@ -218,26 +217,9 @@ const refresh = async function () {
   fontPos.splice(0, fontPos.length)
   checkPosArr.splice(0, checkPosArr.length)
   num.value = 1
-  await getPictrue()
   showRefresh.value = true
 }
 
-// 请求背景图片和验证图片
-const getPictrue = async () => {
-  let data = {
-    captchaType: captchaType.value
-  }
-  const res = await getCode(data)
-  if (res.repCode == '0000') {
-    pointBackImgBase.value = res.repData.originalImageBase64
-    backToken.value = res.repData.token
-    secretKey.value = res.repData.secretKey
-    poinTextList.value = res.repData.wordList
-    text.value = t('captcha.point') + '【' + poinTextList.value.join(',') + '】'
-  } else {
-    text.value = res.repMsg
-  }
-}
 //坐标转换函数
 const pointTransfrom = function (pointArr, imgSize) {
   var newPointArr = pointArr.map((p) => {

client/src/components/Verifition/src/Verify/VerifySlide.vue

@@ -78,7 +78,7 @@
  * */
 import { aesEncrypt } from './../utils/ase'
 import { resetSize } from './../utils/util'
-import { getCode, reqCheck } from '@/api/login'
+import { reqCheck } from '@/api/login'
 
 const props = defineProps({
   captchaType: {
@@ -172,7 +172,6 @@ const init = () => {
   } else {
     text.value = explain.value
   }
-  getPictrue()
   nextTick(() => {
     let { imgHeight, imgWidth, barHeight, barWidth } = resetSize(proxy)
     setSize.imgHeight = imgHeight
@@ -350,27 +349,10 @@ const refresh = async () => {
   iconClass.value = 'icon-right'
   isEnd.value = false
 
-  await getPictrue()
   setTimeout(() => {
     transitionWidth.value = ''
     transitionLeft.value = ''
     text.value = explain.value
   }, 300)
 }
-
-// 请求背景图片和验证图片
-const getPictrue = async () => {
-  let data = {
-    captchaType: captchaType.value
-  }
-  const res = await getCode(data)
-  if (res.repCode == '0000') {
-    backImgBase.value = res.repData.originalImageBase64
-    blockBackImgBase.value = res.repData.jigsawImageBase64
-    backToken.value = res.repData.token
-    secretKey.value = res.repData.secretKey
-  } else {
-    tipWords.value = res.repMsg
-  }
-}
 </script>

client/src/permission.ts

@@ -57,6 +57,10 @@ router.beforeEach(async (to, from, next) => {
       }
     }
   } else {
+    // if (to.path.indexOf('loginAdmin') !== -1 && to.query.debugger === '1') {
+    //   next()
+    //   return
+    // }
     if (whiteList.indexOf(to.path) !== -1) {
       next()
     } else {

client/src/router/modules/remaining.ts

@@ -112,6 +112,14 @@ const remainingRouter: AppRouteRecordRaw[] = [
           title: '办件中心'
         }
       },
+      // {
+      //   path: 'mainOfficeCenter2',
+      //   component: () => import('@/views/OaSystem/officeCenter/mainOfficeCenter/index.vue'),
+      //   name: 'mainOfficeCenter',
+      //   meta: {
+      //     title: '办件中心'
+      //   }
+      // },
       {
         path: 'createNewProcess',
         component: () => import('@/views/OaSystem/officeCenter/createNewProcess/index.vue'),

client/src/views/OaSystem/financialManagement/bzjglPage/UserForm.vue

@@ -22,12 +22,7 @@
       <el-row>
         <el-col :span="12">
           <el-form-item label="已核销金额" prop="writeOffAmount">
-            <el-input
-              v-model="formData.writeOffAmount"
-              placeholder="请输入已核销金额"
-              @change="changeVerify"
-              type="number"
-            />
+            <el-input v-model="formData.writeOffAmount" disabled />
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -37,6 +32,16 @@
         </el-col>
       </el-row>
       <el-row>
+        <el-col :span="12">
+          <el-form-item label="本次拟核销金额" prop="nowAmount">
+            <el-input
+              v-model="formData.nowAmount"
+              placeholder="本次拟核销金额"
+              @change="changeVerify"
+              type="number"
+            />
+          </el-form-item>
+        </el-col>
         <el-col :span="12">
           <el-form-item label="核销时间" prop="writeOffTime">
             <el-date-picker
@@ -82,6 +87,7 @@ const dialogVisible = ref(false) // 弹窗的是否展示
 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
 const formType = ref('') // 表单的类型：create - 新增；update - 修改
 const formData = ref({
+  nowAmount: 0,
   writeOffAmount: '',
   writeOffTime: '',
   writeOffRemark: '',
@@ -102,7 +108,7 @@ const checkAge = (rule: any, value: any, callback: any) => {
   }, 1000)
 }
 const formRules = reactive({
-  writeOffAmount: [{ validator: checkAge, trigger: 'blur' }]
+  nowAmount: [{ validator: checkAge, trigger: 'blur' }]
 })
 const formRef = ref() // 表单 Ref
 /** 打开弹窗 */
@@ -120,6 +126,7 @@ const open = async (row: object) => {
     formLoading.value = true
     try {
       formData.value = row
+      formData.value.nowAmount = 0
     } finally {
       formLoading.value = false
     }
@@ -143,7 +150,7 @@ const submitForm = async () => {
     }
 
     const sendData = {
-      writeOffAmount: formData.value.writeOffAmount,
+      writeOffAmount: formData.value.writeOffAmount + formData.value.nowAmount,
       writeOffTime: formData.value.writeOffTime,
       writeOffRemark: formData.value.writeOffRemark,
       id: formData.value.detailId
@@ -161,7 +168,7 @@ const submitForm = async () => {
   }
 }
 const changeVerify = () => {
-  formData.value.loanBalance = formData.value.amount - formData.value.writeOffAmount
+  formData.value.loanBalance = formData.value.amount - formData.value.nowAmount
   if (formData.value.loanBalance < 0) {
     formData.value.loanBalance = 0
   }
@@ -169,6 +176,7 @@ const changeVerify = () => {
 /** 重置表单 */
 const resetForm = () => {
   formData.value = {
+    nowAmount: '',
     writeOffAmount: '',
     writeOffTime: '',
     writeOffRemark: '',

client/src/views/OaSystem/financialManagement/clfbxPage/index.vue

@@ -13,6 +13,10 @@
         <span class="formSpan">报销人部门：</span>
         <DeptTree v-model="queryParams['deptId']" placeholder="请选择部门" check-strictly />
       </div>
+      <div class="form">
+        <span class="formSpan">项目部门：</span>
+        <DeptTree v-model="queryParams['projectDeptId']" placeholder="请选择部门" check-strictly />
+      </div>
       <div class="form" style="width: 380px">
         <span class="formSpan">申请时间：</span>
         <el-date-picker
@@ -25,10 +29,6 @@
           end-placeholder="结束日期"
         />
       </div>
-      <div class="form">
-        <span class="formSpan">项目部门：</span>
-        <DeptTree v-model="queryParams['projectDeptId']" placeholder="请选择部门" check-strictly />
-      </div>
       <div class="form">
         <span class="formSpan">状态：</span>
         <el-select v-model="queryParams.status" placeholder="状态" clearable class="!w-240px">

client/src/views/OaSystem/financialManagement/loan/UserForm.vue

@@ -5,7 +5,7 @@
       v-loading="formLoading"
       :model="formData"
       :rules="formRules"
-      label-width="100px"
+      label-width="120px"
     >
       <el-row>
         <el-col :span="12">
@@ -22,12 +22,7 @@
       <el-row>
         <el-col :span="12">
           <el-form-item label="已核销金额" prop="verifyAmount">
-            <el-input
-              v-model="formData.verifyAmount"
-              placeholder="请输入已核销金额"
-              @change="changeVerify"
-              type="number"
-            />
+            <el-input v-model="formData.verifyAmount" disabled />
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -37,6 +32,16 @@
         </el-col>
       </el-row>
       <el-row>
+        <el-col :span="12">
+          <el-form-item label="本次拟核销金额" prop="nowAmount">
+            <el-input
+              v-model="formData.nowAmount"
+              placeholder="本次拟核销金额"
+              @change="changeVerify"
+              type="number"
+            />
+          </el-form-item>
+        </el-col>
         <el-col :span="12">
           <el-form-item label="核销时间" prop="verifyDate">
             <el-date-picker
@@ -82,6 +87,7 @@ const dialogVisible = ref(false) // 弹窗的是否展示
 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
 const formType = ref('') // 表单的类型：create - 新增；update - 修改
 const formData = ref({
+  nowAmount: 0,
   verifyAmount: '',
   verifyDate: '',
   verifyBz: '',
@@ -102,7 +108,7 @@ const checkAge = (rule: any, value: any, callback: any) => {
   }, 1000)
 }
 const formRules = reactive({
-  verifyAmount: [{ validator: checkAge, trigger: 'blur' }]
+  nowAmount: [{ validator: checkAge, trigger: 'blur' }]
 })
 const formRef = ref() // 表单 Ref
 /** 打开弹窗 */
@@ -118,6 +124,7 @@ const open = async (row: object) => {
     formLoading.value = true
     try {
       formData.value = row
+      formData.value.nowAmount = 0
     } finally {
       formLoading.value = false
     }
@@ -137,7 +144,7 @@ const submitForm = async () => {
   try {
     const urlApi = `/Loan/update`
     const sendData = {
-      verifyAmount: formData.value.verifyAmount,
+      verifyAmount: formData.value.verifyAmount + formData.value.nowAmount,
       verifyDate: formData.value.verifyDate,
       verifyBz: formData.value.verifyBz,
       id: formData.value.id
@@ -155,7 +162,7 @@ const submitForm = async () => {
   }
 }
 const changeVerify = () => {
-  formData.value.loanBalance = formData.value.loanAmount - formData.value.verifyAmount
+  formData.value.loanBalance = formData.value.loanAmount - formData.value.nowAmount
   if (formData.value.loanBalance < 0) {
     formData.value.loanBalance = 0
   }
@@ -163,6 +170,7 @@ const changeVerify = () => {
 /** 重置表单 */
 const resetForm = () => {
   formData.value = {
+    nowAmount: '',
     verifyAmount: '',
     verifyDate: '',
     bz1: '',

client/src/views/OaSystem/financialManagement/yksqDbPage/index.vue

@@ -5,7 +5,7 @@
 </template>
 
 <script lang="ts" setup>
-defineOptions({ name: 'YksqPage' })
+defineOptions({ name: 'YksqDbPage' })
 </script>
 
 <style lang="scss" scoped>

client/src/views/OaSystem/officeCenter/mainOfficeCenter/common.ts

@@ -0,0 +1,75 @@
+import { string } from 'vue-types'
+
+type TabType = {
+  name: string
+  key: string
+  value: number
+}
+export const tabConfig: TabType[] = [
+  {
+    name: '待办',
+    key: '1',
+    value: 0
+  },
+  {
+    name: '已完成',
+    key: '90',
+    value: 0
+  },
+  {
+    name: '已退回',
+    key: '40',
+    value: 0
+  },
+  {
+    name: '挂起',
+    key: '20',
+    value: 0
+  },
+  {
+    name: '作废',
+    key: '160',
+    value: 0
+  }
+]
+
+export const TabColumns = {
+  //待办
+  '1': [
+    {
+      label: '操作',
+      name: 'action',
+      width: 138,
+      frozen: true,
+      fixed: true
+    },
+    { label: 'participantId', name: 'PARTICIPANTID', hidden: true },
+    { label: 'activityInsId', name: 'ACTIVITYINSID', hidden: true },
+    { label: 'flowInsId', name: 'FLOWINSID', hidden: true },
+    { label: 'IEXT', name: 'IEXT', hidden: true },
+    { label: '业务编号', align: 'center', name: 'CODE', width: 250, fixed: true },
+    {
+      label: '环节完成情况',
+      align: 'center',
+      name: 'statusVal',
+      width: 90,
+      fixed: true
+    },
+    {
+      label: '流程描述',
+      align: 'left',
+      name: 'DESCRIBTION',
+      minwidth: 600
+    },
+    { label: '流程名称', align: 'left', name: 'NAME', width: 130, fixed: true },
+    { label: '完成环节', align: 'center', name: 'ACTIVITYNAME', width: 160, fixed: true },
+    {
+      label: '完成时间',
+      align: 'center',
+      name: 'FINISH_TIME',
+      width: 160,
+      fixed: true
+    },
+    { label: '当前在办环节', align: 'center', name: 'currentActivityVal', width: 180, fixed: true }
+  ]
+}

client/src/views/OaSystem/officeCenter/mainOfficeCenter/index.vue

@@ -0,0 +1,129 @@
+<template>
+  <div class="mainOfficeCenter">
+    <div class="header">
+      <el-button type="danger">新建流程</el-button>
+      <ul class="tabs">
+        <li v-for="item in tabConfig" :key="item['key']">{{ item['name'] }}</li>
+      </ul>
+      <div class="search">
+        <el-form :inline="true" :model="searchForm" class="demo-form-inline">
+          <el-form-item label="流程名称">
+            <el-tree-select
+              v-model="value"
+              :data="data"
+              :render-after-expand="false"
+              show-checkbox
+              style="width: 240px"
+            />
+          </el-form-item>
+          <el-form-item label="">
+            <el-input type="text" />
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary">查询</el-button>
+          </el-form-item>
+        </el-form>
+      </div>
+    </div>
+    <div class="table_box">
+      <div class="table">
+        <el-table :data="tableData" style="width: 100%" height="250">
+          <el-table-column fixed prop="date" label="Date" width="150" />
+          <el-table-column prop="name" label="Name" width="120" />
+          <el-table-column prop="state" label="State" width="120" />
+          <el-table-column prop="city" label="City" width="320" />
+          <el-table-column prop="address" label="Address" width="600" />
+          <el-table-column prop="zip" label="Zip" width="120" />
+        </el-table>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import {
+  getHandlerCaseCenterList,
+  getHandlerCaseCenterCount,
+  getFlowTemplateTreeDataByUser,
+  getFlowTemplateTree
+} from '@/api/oa/workflow'
+import { tabConfig, TabColumns } from './common'
+
+const sendData = {
+  status: 90,
+  flowTemIds: [],
+  searchVal: '',
+  isMobile: false,
+  queryMethod: 0,
+  toSystemId: '',
+  excludedSystemId: '',
+  page: 1,
+  rows: 15
+}
+const queryHandlerCaseCenterList = () => {
+  const formData = new FormData()
+  const keys = Object.keys(sendData)
+  for (let key of keys) {
+    formData.set(key, sendData[key])
+  }
+  getHandlerCaseCenterList(formData)
+  getHandlerCaseCenterCount(formData)
+}
+queryHandlerCaseCenterList()
+getFlowTemplateTree()
+const queryFlowTemplateTreeDataByUser = () => {
+  const formData = new FormData()
+  formData.append('isRight', '0')
+  formData.append('toSystemId', '')
+  formData.append('excludedSystemId', '')
+  formData.append('officeStatus', '1')
+  getFlowTemplateTreeDataByUser(formData)
+}
+queryFlowTemplateTreeDataByUser()
+const tabs = ref([])
+const searchForm = ref({
+  name: ''
+})
+const tableData = [
+  {
+    date: '2016-05-03',
+    name: 'Tom',
+    address: 'No. 189, Grove St, Los Angeles'
+  },
+  {
+    date: '2016-05-02',
+    name: 'Tom',
+    address: 'No. 189, Grove St, Los Angeles'
+  },
+  {
+    date: '2016-05-04',
+    name: 'Tom',
+    address: 'No. 189, Grove St, Los Angeles'
+  },
+  {
+    date: '2016-05-01',
+    name: 'Tom',
+    address: 'No. 189, Grove St, Los Angeles'
+  },
+  {
+    date: '2016-05-08',
+    name: 'Tom',
+    address: 'No. 189, Grove St, Los Angeles'
+  },
+  {
+    date: '2016-05-06',
+    name: 'Tom',
+    address: 'No. 189, Grove St, Los Angeles'
+  },
+  {
+    date: '2016-05-07',
+    name: 'Tom',
+    address: 'No. 189, Grove St, Los Angeles'
+  }
+]
+</script>
+
+<style lang="scss" scoped>
+.mainOfficeCenter {
+}
+</style>

client/src/views/OaSystem/personnelManagement/components/AmountOfWork.vue

@@ -30,7 +30,7 @@
               :visible="item.visible"
             >
               <template #reference>
-                <div class="time-select" @click="openDialog(item.id)">
+                <div class="time-select">
                   <span>{{ item.count ? `（${item.count}小时）` : '' }}</span>
                   {{ item['name'] }}
                 </div>
@@ -288,6 +288,7 @@ const clearSearch = () => {
 
 interface IProject {
   name: string
+  id: string
 }
 const emit = defineEmits<{
   (e: 'select', val: IProject): void
@@ -295,6 +296,7 @@ const emit = defineEmits<{
 
 const handleClick = (val: IProject): void => {
   emit('select', val)
+  openDialog(val.id)
 }
 
 // 打开弹窗

client_h5/index.html

@@ -9,7 +9,7 @@
       // window.vConsole = new window.VConsole()
       window.locationBaseUrl = "/html_h5"
     </script>
-    <title></title>
+    <title>万维空间OA</title>
   </head>
   <body>
     <div id="app"></div>

client_h5/package.json

@@ -10,7 +10,7 @@
     "pro": "vite --mode pro",
     "build": "vite build --mode dev",
     "build:local": "vue-tsc && vite build --mode base",
-    "build:dev": "vue-tsc && vite build --mode dev",
+    "build:dev": "vite build --mode dev",
     "build:prod": "vite build --mode pro",
     "preview": "vite preview"
   },

zjugis-business/src/main/resources/mapper/oracle/AssetProcureDetailMapper.xml

@@ -91,7 +91,7 @@
         FROM ASSET_PROCURE T
         LEFT JOIN PROJECT T2 ON T.PROJECT_ID=T2.ID
         LEFT JOIN ZJUGIS_OA.SYSTEM_USERS US ON US.ID = T.USER_ID
-        LEFT JOIN ZJUGIS_OA.SYSTEM_DEPT D ON D.ID_BAK = US.DEPT_ID_BAK
+        LEFT JOIN ZJUGIS_OA.SYSTEM_DEPT D ON D.ID = US.DEPT_ID
 
         <where>
             T.ISVALID = 1 AND T.FLOW_STATUS = 90

zjugis-business/src/main/resources/mapper/oracle/LoanMapper.xml

@@ -5,7 +5,7 @@
     <select id="page" resultType="com.zjugis.business.bean.entity.Loan">
         SELECT L.*,D.NAME as workerDept FROM LOAN L
         LEFT JOIN ZJUGIS_OA.SYSTEM_USERS UD ON UD.ID = L.WORKER_ID
-        LEFT JOIN ZJUGIS_OA.SYSTEM_DEPT D ON D.ID_BAK = UD.DEPT_ID_BAK
+        LEFT JOIN ZJUGIS_OA.SYSTEM_DEPT D ON D.ID = UD.DEPT_ID
         <where>
             L.ISVALID = 1 and FLOW_STATUS=90
             <if test="params != null and params.loanNumber != null and params.loanNumber != ''">
@@ -72,7 +72,7 @@
         sum(case when L.IS_VERIFY =1 then LOAN_AMOUNT else 0 end ) as hexiaoAmount
         FROM LOAN L
         LEFT JOIN ZJUGIS_OA.SYSTEM_USERS UD ON UD.ID = L.WORKER_ID
-        LEFT JOIN ZJUGIS_OA.SYSTEM_DEPT D ON D.ID_BAK = UD.DEPT_ID_BAK
+        LEFT JOIN ZJUGIS_OA.SYSTEM_DEPT D ON D.ID = UD.DEPT_ID
         <where>
             L.ISVALID = 1 and (FLOW_STATUS=90 or IS_VERIFY=1)
             <if test="params != null and params.loanNumber != null and params.loanNumber != ''">

zjugis-business/src/main/resources/mapper/oracle/OutsourcePurchaseDetMapper.xml

@@ -42,7 +42,7 @@
         FROM WF_OUTSOURCE_PURCHASE T
         LEFT JOIN PROJECT T2 ON T.PROJECT_ID=T2.ID
         LEFT JOIN ZJUGIS_OA.SYSTEM_USERS US ON US.ID = T.USER_ID
-        LEFT JOIN ZJUGIS_OA.SYSTEM_DEPT D ON D.ID_BAK = US.DEPT_ID_BAK
+        LEFT JOIN ZJUGIS_OA.SYSTEM_DEPT D ON D.ID = US.DEPT_ID
 
         <where>
             T.ISVALID = 1 and T.FLOW_STATUS=90

zjugis-module-adm/zjugis-module-adm-biz/src/main/java/com/zjugis/module/adm/service/report/ReportServiceImpl.java

@@ -548,7 +548,7 @@ public class ReportServiceImpl implements ReportService {
             statisticRespVO.setDeptId(staff.getDeptId());
             statisticRespVO.setDeptName(staff.getDeptName());
 
-            Integer leaveDays = allLeaveDayOrWeekMap.get(staff.getId());
+            Integer leaveDays = allLeaveDayOrWeekMap.get(staff.getId()) == null ? 0 : allLeaveDayOrWeekMap.get(staff.getId());
             statisticRespVO.setShouldFilledCount(shouldFillCount - leaveDays);
             List<ReportDO> staffReportList = staffReportMap.get(staff.getId());
             statisticRespVO.setFilledCount(staffReportList == null ? 0 : staffReportList.size());

zjugis-module-adm/zjugis-module-adm-biz/src/main/java/com/zjugis/module/adm/service/staff/RecordsServiceImpl.java

@@ -28,6 +28,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.time.LocalDateTime;
+import java.time.LocalTime;
 import java.time.temporal.ChronoUnit;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -82,7 +83,7 @@ public class RecordsServiceImpl implements RecordsService {
                         .likeIfPresent(StaffRecordSDO::getMajor, reqVO.getMajor())
                         .eqIfPresent(StaffRecordSDO::getZgxl, reqVO.getZgxl())
                         .inIfPresent(StaffRecordSDO::getUserId, userIds)
-                        .ne(StaffRecordSDO::getLoginName,"admin")//过滤掉管理员
+                        .ne(StaffRecordSDO::getLoginName, "admin")//过滤掉管理员
                         .orderByDesc(StaffRecordSDO::getUpdateTime)
         );
 
@@ -99,6 +100,12 @@ public class RecordsServiceImpl implements RecordsService {
             userList.forEach(v -> map.put(v.getId(), v));
             page.getRecords().forEach(v -> {
                 AdminUserRespDTO user = map.get(v.getUserId());
+
+                //判断初始入公司时间
+                if (v.getYsrzsj() != null) {
+                    v.setRgssj(LocalDateTime.of(v.getYsrzsj(), LocalTime.MIDNIGHT));
+                }
+
                 if (user != null) {
                     v.setDeptName(user.getDeptName());
                     v.setDeptId(user.getDeptId());
@@ -143,6 +150,11 @@ public class RecordsServiceImpl implements RecordsService {
             vo.setFamilyList(family);
         }
 
+        if (vo.getYsrzsj() != null) {
+            vo.setRgssj(LocalDateTime.of(vo.getYsrzsj(), LocalTime.MIDNIGHT));
+        }
+
+
         return vo;
     }
 

zjugis-module-system/zjugis-module-system-biz/src/main/resources/bootstrap.yaml

@@ -3,7 +3,7 @@ spring:
     name: system-server
 
   profiles:
-    active: dev
+    active: local