diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index 3c85241..d3541de 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -26,6 +26,11 @@
+
+
+
+
+
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 146b7a9..90390b7 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,45 +4,18 @@
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
@@ -66,8 +39,8 @@
+
+
+
{
"associatedIndex": 3
@@ -102,6 +78,7 @@
"Maven.YnRealNameWeb [clean].executor": "Run",
"Maven.YnRealNameWeb [compile].executor": "Run",
"Maven.YnRealNameWeb [install].executor": "Run",
+ "Maven.YnRealNameWeb [package].executor": "Run",
"RequestMappingsPanelOrder0": "0",
"RequestMappingsPanelOrder1": "1",
"RequestMappingsPanelWidth0": "75",
@@ -109,6 +86,8 @@
"RunOnceActivity.OpenProjectViewOnStart": "true",
"RunOnceActivity.ShowReadmeOnStart": "true",
"RunOnceActivity.git.unshallow": "true",
+ "SHARE_PROJECT_CONFIGURATION_FILES": "true",
+ "SONARLINT_PRECOMMIT_ANALYSIS": "true",
"Spring Boot.AuthApplication.executor": "Run",
"Spring Boot.BmwApplication.executor": "Run",
"Spring Boot.FileApplication.executor": "Run",
@@ -117,7 +96,7 @@
"git-widget-placeholder": "main",
"ignore.virus.scanning.warn.message": "true",
"kotlin-language-version-configured": "true",
- "last_opened_file_path": "F:/workspace/idea/dameng_real_name/modules/file/lib",
+ "last_opened_file_path": "F:/workspace/idea/dameng_real_name_22",
"node.js.detected.package.eslint": "true",
"node.js.detected.package.tslint": "true",
"node.js.selected.package.eslint": "(autodetect)",
@@ -127,7 +106,7 @@
"project.structure.proportion": "0.0",
"project.structure.side.proportion": "0.44484413",
"run.configurations.included.in.services": "true",
- "settings.editor.selected.configurable": "MavenSettings",
+ "settings.editor.selected.configurable": "reference.settings.project.maven.repository.indices",
"vue.rearranger.settings.migration": "true"
}
}]]>
@@ -136,11 +115,11 @@
-
-
-
-
-
+
+
+
+
+
@@ -166,7 +145,27 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -202,6 +201,13 @@
+
+
+
+
+
+
+
@@ -209,9 +215,20 @@
+
+
@@ -256,7 +273,26 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -290,7 +326,23 @@
1755851732156
-
+
+
+ 1761125097617
+
+
+
+ 1761125097617
+
+
+
+ 1761287828807
+
+
+
+ 1761287828807
+
+
@@ -377,7 +429,9 @@
-
+
+
+
@@ -396,6 +450,11 @@
46
+
+ file://$PROJECT_DIR$/common/common-datascope/src/main/java/com/bonus/common/datascope/aspect/DataScopeAspect.java
+ 66
+
+
diff --git a/common/common-security/src/main/java/com/bonus/common/security/service/TokenService.java b/common/common-security/src/main/java/com/bonus/common/security/service/TokenService.java
index fb593e6..0cb43b0 100644
--- a/common/common-security/src/main/java/com/bonus/common/security/service/TokenService.java
+++ b/common/common-security/src/main/java/com/bonus/common/security/service/TokenService.java
@@ -55,13 +55,13 @@ public class TokenService
loginUser.setUsername(userName);
loginUser.setIpaddr(IpUtils.getIpAddr(ServletUtils.getRequest()));
refreshToken(loginUser);
-
+ String userKey = getTokenKey(loginUser.getToken());
// Jwt存储信息
Map claimsMap = new HashMap();
claimsMap.put(SecurityConstants.USER_KEY, token);
claimsMap.put(SecurityConstants.DETAILS_USER_ID, userId);
claimsMap.put(SecurityConstants.DETAILS_USERNAME, userName);
-
+ redisService.setCacheObject(getTokenKey(userKey),loginUser);
// 接口返回信息
Map rspMap = new HashMap();
rspMap.put("access_token", JwtUtils.createToken(claimsMap));
@@ -105,6 +105,8 @@ public class TokenService
if (StringUtils.isNotEmpty(token))
{
String userkey = JwtUtils.getUserKey(token);
+ String key=getTokenKey(userkey);
+ System.err.println(key);
user = redisService.getCacheObject(getTokenKey(userkey));
return user;
}
@@ -164,6 +166,7 @@ public class TokenService
loginUser.setExpireTime(loginUser.getLoginTime() + expireTime * MILLIS_MINUTE);
// 根据uuid将loginUser缓存
String userKey = getTokenKey(loginUser.getToken());
+ System.err.println(userKey);
redisService.setCacheObject(userKey, loginUser, expireTime, TimeUnit.MINUTES);
}
diff --git a/modules/bmw/src/main/java/com/bonus/bmw/subeva/dao/SubCorepersonDao.java b/modules/bmw/src/main/java/com/bonus/bmw/subeva/dao/SubCorepersonDao.java
index 94f90c8..1381639 100644
--- a/modules/bmw/src/main/java/com/bonus/bmw/subeva/dao/SubCorepersonDao.java
+++ b/modules/bmw/src/main/java/com/bonus/bmw/subeva/dao/SubCorepersonDao.java
@@ -22,7 +22,7 @@ public interface SubCorepersonDao {
List rankList(@Param("params") Map params, @Param("offset") Integer offset, @Param("limit") Integer limit);
// 分页
- int rankCount(@Param("params") Map params);
+ Integer rankCount(@Param("params") Map params);
List getPersonNameList(SubEvaBean o);
diff --git a/modules/bmw/src/main/java/com/bonus/bmw/subeva/service/SubCorepersonServiceImpl.java b/modules/bmw/src/main/java/com/bonus/bmw/subeva/service/SubCorepersonServiceImpl.java
index 9289ec5..c9a4e40 100644
--- a/modules/bmw/src/main/java/com/bonus/bmw/subeva/service/SubCorepersonServiceImpl.java
+++ b/modules/bmw/src/main/java/com/bonus/bmw/subeva/service/SubCorepersonServiceImpl.java
@@ -58,7 +58,11 @@ public class SubCorepersonServiceImpl implements SubCorepersonService{
@Override
public int rankCount(Map params) {
- return dao.rankCount(params);
+ Integer num= dao.rankCount(params);
+ if(null == num){
+ return 0;
+ }
+ return num;
}
@Override
diff --git a/modules/bmw/src/main/java/com/bonus/bmw/team/controller/TeamBasicController.java b/modules/bmw/src/main/java/com/bonus/bmw/team/controller/TeamBasicController.java
index 4867d88..9741c0b 100644
--- a/modules/bmw/src/main/java/com/bonus/bmw/team/controller/TeamBasicController.java
+++ b/modules/bmw/src/main/java/com/bonus/bmw/team/controller/TeamBasicController.java
@@ -44,7 +44,7 @@ public class TeamBasicController {
@GetMapping
@Log(title = "班组基础管理-班组基础列表", businessType = BusinessType.SELECT)
- @RequiresPermissions("sys:teamBasic:query")
+// @RequiresPermissions("sys:teamBasic:query")
public PageTableResponse listSubCompany(PageTableRequest request) {
String roleLevel = SecurityUtils.getLoginUser().getSysUser().getRoleLevel();
String subId = SecurityUtils.getLoginUser().getSysUser().getSubId();
diff --git a/modules/bmw/src/main/resources/bootstrap.yml b/modules/bmw/src/main/resources/bootstrap.yml
index 7580d86..e26c089 100644
--- a/modules/bmw/src/main/resources/bootstrap.yml
+++ b/modules/bmw/src/main/resources/bootstrap.yml
@@ -37,6 +37,7 @@ spring:
config:
# 配置中心地址
server-addr: @nacos.server@
+ namespace: @name.space@
# 配置文件格式
file-extension: yml
# 共享配置
diff --git a/modules/bmw/src/main/resources/mapper/SubContractor/SubContractorMapper.xml b/modules/bmw/src/main/resources/mapper/SubContractor/SubContractorMapper.xml
index 8a765ee..5d4e704 100644
--- a/modules/bmw/src/main/resources/mapper/SubContractor/SubContractorMapper.xml
+++ b/modules/bmw/src/main/resources/mapper/SubContractor/SubContractorMapper.xml
@@ -242,7 +242,10 @@
LEFT JOIN "ynrealname"."bm_team_user_relation" btur ON btur."team_id" = bst2."id" and btur."is_active" = '1'
LEFT JOIN "ynrealname"."bm_worker" bw ON bw."id_number" = btur."id_number" and bw."is_active" = '1'
where bst2."is_active" = '1'
- GROUP BY bst2."id" having teamStatus > 0) aa ON aa."id" = bst2."id"
+ GROUP BY bst2."id"
+ HAVING
+ CASE WHEN SUM(bw."ein_status") > 0 THEN 1 ELSE 0 END > 0
+ ) aa ON aa."id" = bst2."id"
WHERE
bs."is_active" = '1'
diff --git a/modules/bmw/src/main/resources/mapper/certificateAdministration/certificateStatMapper.xml b/modules/bmw/src/main/resources/mapper/certificateAdministration/certificateStatMapper.xml
index 1ba7af3..7859aff 100644
--- a/modules/bmw/src/main/resources/mapper/certificateAdministration/certificateStatMapper.xml
+++ b/modules/bmw/src/main/resources/mapper/certificateAdministration/certificateStatMapper.xml
@@ -11,30 +11,42 @@
"name",
sum( "title" ) AS total,
CONCAT( "name", '（', sum( "title" ), '）' ) AS title
- FROM
- (
+ FROM (
SELECT
bct."id" AS "id",
bct."work_type" AS "NAME",
COUNT( DISTINCT bweh."id_number" ) AS "title"
- FROM
- "ynrealname"."bm_certificate_type" bct
+ FROM
+ "ynrealname"."bm_certificate_type" bct
LEFT JOIN (
- SELECT a."id_number", a."certificate_id",a."issuing_authority",a."first_date",
- a."review_date", a."valid_start_date",a."valid_end_date",a."reality_review_date",a."certificate_photo" FROM (
- SELECT * FROM "ynrealname"."bm_certificate_read" ORDER BY "valid_end_date" DESC FETCH FIRST 999999999 ROWS ONLY
- ) a GROUP BY a."id_number", a."certificate_id",a."issuing_authority",a."first_date",
+ SELECT
+ a."id_number", a."certificate_id",a."issuing_authority",a."first_date",
+ a."review_date", a."valid_start_date",a."valid_end_date",a."reality_review_date",a."certificate_photo"
+ FROM (
+ SELECT * FROM "ynrealname"."bm_certificate_read"
+ ORDER BY "valid_end_date" DESC
+ FETCH FIRST 999999999 ROWS ONLY
+ ) a
+ GROUP BY
+ a."id_number", a."certificate_id",a."issuing_authority",a."first_date",
a."review_date", a."valid_start_date",a."valid_end_date",a."reality_review_date",a."certificate_photo"
) bcr ON bcr."certificate_id" = bct."id"
- LEFT JOIN "ynrealname"."bm_worker_ein_history" bweh ON bweh."id_number" = bcr."id_number" AND bweh."is_active" = '1' AND bweh."exit_status" !=1
- WHERE bct."is_hidden" = '0' AND bct."is_active" = '1'
-
- AND (bct."work_type" like concat('%',#{name},'%') OR bct."neaten_work_operation" like concat('%',#{name},'%'))
-
- GROUP BY bct."work_type",
+ LEFT JOIN "ynrealname"."bm_worker_ein_history" bweh
+ ON bweh."id_number" = bcr."id_number"
+ AND bweh."is_active" = '1'
+ AND bweh."exit_status" != 1
+ WHERE
+ bct."is_hidden" = '0'
+ AND bct."is_active" = '1'
+
+ AND (bct."work_type" like concat('%',#{name},'%') OR bct."neaten_work_operation" like concat('%',#{name},'%'))
+
+ GROUP BY
+ bct."id", -- 补充id到GROUP BY
+ bct."work_type",
bct."neaten_work_operation"
) a
- GROUP BY "id", "name"
+ GROUP BY "id", "name" -- 外层分组基于内层的唯一id和name，无需额外添加