From b70bbce994e573e58d4ee79a53ea60e9338b2516 Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期一, 06 五月 2024 10:18:37 +0800
Subject: [PATCH] 最新版本
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/DeviceRole.java | 4 +
server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/CompanyController.java | 4
server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/MemberCardController.java | 4
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/MemberCardService.java | 3
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Category.java | 3
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Company.java | 6 +-
server/visits/dmvisit_admin/src/main/java/com/doumee/api/cloud/CompanyCloudController.java | 8 +-
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/MemberCard.java | 3
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java | 3 +
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberCardServiceImpl.java | 6 +
server/visits/dmvisit_admin/src/main/java/com/doumee/api/cloud/MemberCardCloudController.java | 8 +-
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceRoleServiceImpl.java | 37 +++++++-----
server/visits/dmvisit_admin/src/main/java/com/doumee/api/cloud/DeviceRoleCloudController.java | 8 ++
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java | 27 ++++++--
server/visits/dmvisit_admin/src/main/java/com/doumee/api/cloud/CategoryCloudController.java | 1
15 files changed, 81 insertions(+), 44 deletions(-)
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/CompanyController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/CompanyController.java
index ab99d4f..c221721 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/CompanyController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/CompanyController.java
@@ -66,7 +66,7 @@
@GetMapping("/delete/{id}")
@RequiresPermissions("business:company:delete")
public ApiResponse deleteById(@PathVariable Integer id) {
- companyService.deleteById(id);
+ companyService.deleteById(id,this.getLoginUser());
return ApiResponse.success(null);
}
@@ -79,7 +79,7 @@
for (String id : idArray) {
idList.add(Integer.valueOf(id));
}
- companyService.deleteByIdInBatch(idList);
+ companyService.deleteByIdInBatch(idList,this.getLoginUser());
return ApiResponse.success(null);
}
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/MemberCardController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/MemberCardController.java
index 435eb94..3631210 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/MemberCardController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/MemberCardController.java
@@ -71,7 +71,7 @@
@PostMapping("/batchLoss")
@RequiresPermissions("business:membercard:update")
public ApiResponse batchLoss(@RequestBody List<MemberCard> memberCards) {
- memberCardService.updateByIdInBatch(memberCards,0);
+ memberCardService.updateByIdInBatch(memberCards,0,this.getLoginUser());
return ApiResponse.success(null);
}
@@ -79,7 +79,7 @@
@PostMapping("/batchUnLoss")
@RequiresPermissions("business:membercard:update")
public ApiResponse batchUnLoss(@RequestBody List<MemberCard> memberCards) {
- memberCardService.updateByIdInBatch(memberCards,1);
+ memberCardService.updateByIdInBatch(memberCards,1,this.getLoginUser());
return ApiResponse.success(null);
}
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/cloud/CategoryCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/cloud/CategoryCloudController.java
index 40ae252..7c54ff8 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/cloud/CategoryCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/cloud/CategoryCloudController.java
@@ -35,6 +35,7 @@
@PostMapping("/create")
@CloudRequiredPermission("business:category:create")
public ApiResponse create(@RequestBody Category category,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ category.setLoginUserInfo(this.getLoginUser(token));
return ApiResponse.success(categoryService.create(category));
}
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/cloud/CompanyCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/cloud/CompanyCloudController.java
index 563f75c..148ac82 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/cloud/CompanyCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/cloud/CompanyCloudController.java
@@ -58,7 +58,8 @@
@ApiOperation("鍒涘缓鍔冲姟鍏徃")
@PostMapping("/createLaborServices")
@CloudRequiredPermission("business:company:create")
- public ApiResponse<Integer> createLaborServices(@RequestBody Company company){
+ public ApiResponse<Integer> createLaborServices(@RequestBody Company company,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ company.setLoginUserInfo(this.getLoginUser(token));
return ApiResponse.success(companyService.createLaborServices(company));
}
@@ -66,7 +67,7 @@
@GetMapping("/delete/{id}")
@CloudRequiredPermission("business:company:delete")
public ApiResponse deleteById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
- companyService.deleteById(id);
+ companyService.deleteById(id,this.getLoginUser(token));
return ApiResponse.success(null);
}
@@ -79,7 +80,7 @@
for (String id : idArray) {
idList.add(Integer.valueOf(id));
}
- companyService.deleteByIdInBatch(idList);
+ companyService.deleteByIdInBatch(idList,this.getLoginUser(token));
return ApiResponse.success(null);
}
@@ -87,6 +88,7 @@
@PostMapping("/updateById")
@CloudRequiredPermission("business:company:update")
public ApiResponse updateById(@RequestBody Company company,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ company.setLoginUserInfo(this.getLoginUser(token));
companyService.updateById(company);
return ApiResponse.success(null);
}
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/cloud/DeviceRoleCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/cloud/DeviceRoleCloudController.java
index 422d131..5638e29 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/cloud/DeviceRoleCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/cloud/DeviceRoleCloudController.java
@@ -34,7 +34,8 @@
@ApiOperation("鏂板缓")
@PostMapping("/create")
@CloudRequiredPermission("business:devicerole:create")
- public ApiResponse create(@RequestBody DeviceRole deviceRole) {
+ public ApiResponse create(@RequestBody DeviceRole deviceRole,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ deviceRole.setLoginUserInfo(this.getLoginUser(token));
return ApiResponse.success(deviceRoleService.create(deviceRole));
}
@@ -63,6 +64,8 @@
@PostMapping("/updateById")
@CloudRequiredPermission("business:devicerole:update")
public ApiResponse updateById(@RequestBody DeviceRole deviceRole,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+
+ deviceRole.setLoginUserInfo(this.getLoginUser(token));
deviceRoleService.updateById(deviceRole);
return ApiResponse.success(null);
}
@@ -71,12 +74,15 @@
@PostMapping("/updateStatusById")
@CloudRequiredPermission("business:devicerole:update")
public ApiResponse updateStatusById(@RequestBody DeviceRole deviceRole,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+
+ deviceRole.setLoginUserInfo(this.getLoginUser(token));
deviceRoleService.updateStatusById(deviceRole);
return ApiResponse.success(null);
}
@ApiOperation("榛樿涓嬪彂闂ㄧ缁勮鑹�")
@PostMapping("/updateMemberRole")
public ApiResponse updateMemberRole(@RequestBody DeviceRole deviceRole,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ deviceRole.setLoginUserInfo(this.getLoginUser(token));
deviceRoleService.updateMemberRole(deviceRole);
return ApiResponse.success(null);
}
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/cloud/MemberCardCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/cloud/MemberCardCloudController.java
index bfdc95e..a3d91f6 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/cloud/MemberCardCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/cloud/MemberCardCloudController.java
@@ -34,7 +34,8 @@
@ApiOperation("鏂板缓")
@PostMapping("/create")
@CloudRequiredPermission("business:membercard:create")
- public ApiResponse create(@RequestBody MemberCard memberCard) {
+ public ApiResponse create(@RequestBody MemberCard memberCard,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ memberCard.setLoginUserInfo(this.getLoginUser(token));
return ApiResponse.success(memberCardService.create(memberCard));
}
@@ -71,7 +72,7 @@
@PostMapping("/batchLoss")
@CloudRequiredPermission("business:membercard:update")
public ApiResponse batchLoss(@RequestBody List<MemberCard> memberCards,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
- memberCardService.updateByIdInBatch(memberCards,0);
+ memberCardService.updateByIdInBatch(memberCards,0,this.getLoginUser(token));
return ApiResponse.success(null);
}
@@ -79,7 +80,7 @@
@PostMapping("/batchUnLoss")
@CloudRequiredPermission("business:membercard:update")
public ApiResponse batchUnLoss(@RequestBody List<MemberCard> memberCards,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
- memberCardService.updateByIdInBatch(memberCards,1);
+ memberCardService.updateByIdInBatch(memberCards,1,this.getLoginUser(token));
return ApiResponse.success(null);
}
@@ -87,6 +88,7 @@
@PostMapping("/refundCard")
@CloudRequiredPermission("business:membercard:update")
public ApiResponse refundCard(@RequestBody MemberCard memberCard,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ memberCard.setLoginUserInfo(this.getLoginUser(token));
memberCardService.updateRefundCard(memberCard);
return ApiResponse.success(null);
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Category.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Category.java
index c5a601f..a66a19d 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Category.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Category.java
@@ -1,6 +1,7 @@
package com.doumee.dao.business.model;
import com.doumee.core.annotation.excel.ExcelColumn;
+import com.doumee.core.model.LoginUserModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
@@ -18,7 +19,7 @@
@Data
@ApiModel("鍒嗙被淇℃伅琛�")
@TableName("`category`")
-public class Category {
+public class Category extends LoginUserModel {
@TableId(type = IdType.AUTO)
@ApiModelProperty(value = "涓婚敭")
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Company.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Company.java
index fcccb90..619f61c 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Company.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Company.java
@@ -177,11 +177,11 @@
@ApiModelProperty(value = "娴峰悍閮ㄩ棬绾у埆璺緞", example = "1")
@ExcelColumn(name="娴峰悍閮ㄩ棬绾у埆璺緞")
- private String hk_company_path;
+ private String hkCompanyPath;
@ApiModelProperty(value = "鑷缓閮ㄩ棬绾у埆璺緞", example = "1")
@ExcelColumn(name="鑷缓閮ㄩ棬绾у埆璺緞")
- private String company_path;
+ private String companyPath;
@ApiModelProperty(value = "erp閮ㄩ棬绾у埆璺緞", example = "1")
@ExcelColumn(name="erp閮ㄩ棬绾у埆璺緞")
- private String erp_company_path;
+ private String erpCompanyPath;
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/DeviceRole.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/DeviceRole.java
index dd2046a..ff2c1fc 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/DeviceRole.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/DeviceRole.java
@@ -2,6 +2,8 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
+import com.doumee.core.model.LoginUserInfo;
+import com.doumee.core.model.LoginUserModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
@@ -19,7 +21,7 @@
@Data
@ApiModel("闂ㄧ瑙掕壊淇℃伅琛�")
@TableName("`device_role`")
-public class DeviceRole {
+public class DeviceRole extends LoginUserModel {
@TableId(type = IdType.AUTO)
@ApiModelProperty(value = "涓婚敭", example = "1")
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/MemberCard.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/MemberCard.java
index 323bfb8..c8f3f64 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/MemberCard.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/MemberCard.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
+import com.doumee.core.model.LoginUserModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
@@ -19,7 +20,7 @@
@Data
@ApiModel("鐢ㄦ埛鍗＄墖缁戝畾淇℃伅琛�")
@TableName("`member_card`")
-public class MemberCard {
+public class MemberCard extends LoginUserModel {
@TableId(type = IdType.AUTO)
@ApiModelProperty(value = "涓婚敭")
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/MemberCardService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/MemberCardService.java
index 1f256fa..3276ab1 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/MemberCardService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/MemberCardService.java
@@ -1,5 +1,6 @@
package com.doumee.service.business;
+import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.MemberCard;
@@ -54,7 +55,7 @@
*
* @param memberCards 瀹炰綋闆�
*/
- void updateByIdInBatch(List<MemberCard> memberCards,Integer type);
+ void updateByIdInBatch(List<MemberCard> memberCards, Integer type, LoginUserInfo userInfo);
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java
index 9f61950..e0601bc 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java
@@ -37,6 +37,9 @@
public Integer create(Category category) {
checkUnique(category);
LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ if(loginUserInfo ==null){
+ loginUserInfo = category.getLoginUserInfo();
+ }
Category insert = new Category();
insert.setCreator(loginUserInfo.getId());
insert.setCreateDate(new Date());
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
index e94f81f..33ddd3a 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
@@ -25,6 +25,7 @@
import com.doumee.dao.admin.request.UpdateCompanySortDTO;
import com.doumee.dao.admin.response.CompanyDTO;
import com.doumee.dao.business.CompanyMapper;
+import com.doumee.dao.business.MemberMapper;
import com.doumee.dao.business.join.CompanyJoinMapper;
import com.doumee.dao.business.model.Category;
import com.doumee.dao.business.model.Company;
@@ -54,6 +55,8 @@
@Autowired
private CompanyMapper companyMapper;
@Autowired
+ private MemberMapper memberMapper;
+ @Autowired
private DataSyncConfig dataSyncConfig;
@Autowired
private SystemDictDataBiz systemDictDataBiz;
@@ -79,6 +82,7 @@
user = company.getLoginUserInfo();
}
String rootOrgId = systemDictDataBiz.queryByCode(Constants.HK_PARAM,Constants.HK_ROOTORG_CODE).getCode();
+ company.setCompanyPath(company.getName());//鍚嶇О璺緞
company.setHkParentId(rootOrgId);
if(company.getParentId() !=null){
Company parent = findById(company.getParentId());
@@ -89,7 +93,9 @@
throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "瀵逛笉璧凤紝鐖剁骇缁勭粐淇℃伅灏氭湭鍚屾涓嬪彂鎴愬姛~");
}
company.setHkParentId(parent.getHkId());
+ company.setCompanyPath(parent.getCompanyPath()+"/"+company.getName());
}
+ company.setHkCompanyPath(company.getCompanyPath());
company.setCreateDate(new Date());
company.setCreator(user.getId());
company.setIsdeleted(Constants.ZERO);
@@ -97,7 +103,6 @@
company.setStatus(Constants.ZERO);
company.setHkDate(company.getHkDate());
company.setHkId(UUID.randomUUID().toString().replace("-",""));
-
companyMapper.insert(company);
//涓嬪彂娴峰悍瀹夐槻骞冲彴
if(!addHkOrg(company)){
@@ -109,7 +114,6 @@
private boolean addHkOrg(Company company) {
List<OrgAddRequest> addList = new ArrayList<>();
addList.add(getOrgAddModel(company));
-
BaseResponse<OrgOrUserAddResponse> result = HKService.addBatchOrg(addList);
if(result !=null && StringUtils.equals(result.getCode(),HKConstants.RESPONSE_SUCCEE)){
OrgOrUserAddResponse data = result.getData();
@@ -161,6 +165,7 @@
return model;
}
@Override
+ @Transactional(rollbackFor = {BusinessException.class,Exception.class})
public Integer createLaborServices(Company company) {
LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
if(loginUserInfo ==null){
@@ -189,19 +194,25 @@
}
@Override
+ @Transactional(rollbackFor = {BusinessException.class,Exception.class})
public void deleteById(Integer id, LoginUserInfo user ) {
if(id== null ){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
-
Company model = findById(id);
if(model == null || Constants.equalsInteger(model.getIsdeleted(),Constants.ONE)){
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(), "瀵逛笉璧凤紝缁勭粐淇℃伅涓嶅瓨鍦▇");
}
- if(StringUtils.isBlank(model.getHkId())){
- throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(), "瀵逛笉璧凤紝缁勭粐淇℃伅灏氭湭鍚屾涓嬪彂鎴愬姛,鏆備笉鏀寔淇敼锛岃灏濊瘯鍒犻櫎鍚庨噸鏂版坊鍔爚");
+ if(companyMapper.selectCount(new QueryWrapper<Company>().lambda()
+ .eq(Company::getParentId,model.getId())
+ .eq(Company::getIsdeleted,Constants.ZERO)) >0){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(), "瀵逛笉璧凤紝璇ラ儴闂ㄥ瓨鍦ㄤ笅绾ч儴闂紝涓嶈兘杩涜鍒犻櫎鎿嶄綔锛�");
}
-
+ if(memberMapper.selectCount(new QueryWrapper<Member>().lambda()
+ .eq(Member::getCompanyId,model.getId())
+ .eq(Member::getIsdeleted,Constants.ZERO)) >0){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(), "瀵逛笉璧凤紝璇ラ儴闂ㄤ笅瀛樺湪浜哄憳淇℃伅锛屼笉鑳借繘琛屽垹闄ゆ搷浣滐紒");
+ }
Company company = new Company();
company.setId(id);
company.setEditDate(new Date());
@@ -211,7 +222,7 @@
company.setHkDate(company.getHkDate());
companyMapper.updateById(company);
//涓嬪彂娴峰悍瀹夐槻骞冲彴
- if(!delHkOrg(model)){
+ if(StringUtils.isBlank(model.getHkId()) && Constants.equalsInteger(Constants.ONE,model.getHkStatus()) && !delHkOrg(model)){
throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"瀵逛笉璧凤紝缁勭粐鍒犻櫎涓嬪彂澶辫触锛岃纭璇ョ粍缁囨棤涓嬬骇缁勭粐鎴栫粍缁囦汉鍛樹俊鎭瘇");
}
}
@@ -429,7 +440,7 @@
public void updateStatusById(Company company) {
LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
if(loginUserInfo==null){
- loginUserInfo = company.getLoginUserInfo()
+ loginUserInfo = company.getLoginUserInfo();
}
company.setEditDate(new Date());
company.setEditor(loginUserInfo.getId());
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceRoleServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceRoleServiceImpl.java
index 1ff3b10..980aa3e 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceRoleServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceRoleServiceImpl.java
@@ -1,43 +1,39 @@
package com.doumee.service.business.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.api.R;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
-import com.doumee.core.erp.model.openapi.request.RoleListRequest;
-import com.doumee.core.erp.model.openapi.response.DeviceListResponse;
-import com.doumee.core.erp.model.openapi.response.RoleListResponse;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
-import com.doumee.dao.admin.response.MemberInfoDTO;
import com.doumee.dao.business.*;
import com.doumee.dao.business.join.MemberRoleJoinMapper;
-import com.doumee.dao.business.model.*;
+import com.doumee.dao.business.model.DeviceRole;
+import com.doumee.dao.business.model.Empower;
+import com.doumee.dao.business.model.Member;
+import com.doumee.dao.business.model.MemberRole;
import com.doumee.dao.web.response.DeviceRoleVO;
import com.doumee.service.business.DeviceRoleService;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.doumee.service.business.MemberService;
import com.doumee.service.business.impl.hksync.ferp.HkSyncOrgUserToHKServiceImpl;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
-import io.swagger.models.auth.In;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Bean;
import org.springframework.stereotype.Service;
-
-import java.util.*;
-import java.util.stream.Collectors;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Objects;
/**
* 闂ㄧ瑙掕壊淇℃伅琛⊿ervice瀹炵幇
@@ -78,6 +74,9 @@
newDeviceRole = getDeviceRole(deviceRole.getType());
}
LoginUserInfo loginUserInfo = (LoginUserInfo)SecurityUtils.getSubject().getPrincipal();
+ if(loginUserInfo ==null){
+ loginUserInfo = deviceRole.getLoginUserInfo();
+ }
if(null != newDeviceRole && deviceRole.getIsDefault().equals(Constants.ZERO)) {
DeviceRole updateDeviceRole = new DeviceRole();
// 鑻ョ幇鍦ㄦ柊澧炴暟鎹缃粯璁ら棬绂佺粍锛涢偅涔堝厛鎶婁箣鍓嶇殑榛樿闂ㄧ缁勭姸鎬佹敼涓轰笉鏄粯璁ょ殑
@@ -140,6 +139,9 @@
newDeviceRole = getDeviceRole(deviceRole.getType());
}
LoginUserInfo loginUserInfo = (LoginUserInfo)SecurityUtils.getSubject().getPrincipal();
+ if(loginUserInfo ==null){
+ loginUserInfo = deviceRole.getLoginUserInfo();
+ }
if(null != newDeviceRole && deviceRole.getIsDefault().equals(Constants.ZERO)) {
DeviceRole update = new DeviceRole();
update.setEdirot(loginUserInfo.getId().toString());
@@ -309,6 +311,9 @@
newDeviceRole = getDeviceRole(deviceRole.getType());
}
LoginUserInfo loginUserInfo = (LoginUserInfo)SecurityUtils.getSubject().getPrincipal();
+ if(loginUserInfo ==null){
+ loginUserInfo = deviceRole.getLoginUserInfo();
+ }
List<DeviceRole> deviceRoleList = new ArrayList<>();
if(null != newDeviceRole) {
DeviceRole update = new DeviceRole();
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberCardServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberCardServiceImpl.java
index af8d16d..5b03ed6 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberCardServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberCardServiceImpl.java
@@ -66,6 +66,9 @@
@Transactional(rollbackFor = {BusinessException.class,Exception.class})
public Integer create(MemberCard memberCard) {
LoginUserInfo userInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ if(userInfo == null){
+ userInfo = memberCard.getLoginUserInfo();
+ }
if(Objects.isNull(memberCard.getMemberId())
|| StringUtils.isBlank(memberCard.getCode())){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
@@ -137,8 +140,7 @@
*/
@Override
@Transactional(rollbackFor = {BusinessException.class,Exception.class})
- public void updateByIdInBatch(List<MemberCard> memberCards,Integer type) {
- LoginUserInfo userInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ public void updateByIdInBatch(List<MemberCard> memberCards,Integer type,LoginUserInfo userInfo) {
if (CollectionUtils.isEmpty(memberCards)) {
return;
}
--
Gitblit v1.9.3