Commit 2894cf61 by guojuxing

导购、资源组引用维护调整

parent 1f24b9f5
...@@ -144,7 +144,7 @@ public class UserApiServiceImpl implements UserApiService { ...@@ -144,7 +144,7 @@ public class UserApiServiceImpl implements UserApiService {
accountGroupRelService.deleteByUserId(userId, AccountGroupMemberTypeEnum.ADMIN.getCode()); accountGroupRelService.deleteByUserId(userId, AccountGroupMemberTypeEnum.ADMIN.getCode());
} }
ServiceResponse<Integer> response = saveRole(userId, userDTO.getEnterpriseId(), userDTO.getUserRoleIds(), ServiceResponse<Integer> response = saveRole(userDTO.getUserName(), userId, userDTO.getEnterpriseId(), userDTO.getUserRoleIds(),
userDTO.getUserResourceIds(), userDTO.getAccountGroupIds(), userDTO.getUserGroupIds()); userDTO.getUserResourceIds(), userDTO.getAccountGroupIds(), userDTO.getUserGroupIds());
if (response.isSuccess()) { if (response.isSuccess()) {
return response; return response;
...@@ -285,7 +285,7 @@ public class UserApiServiceImpl implements UserApiService { ...@@ -285,7 +285,7 @@ public class UserApiServiceImpl implements UserApiService {
//同步审核员 //同步审核员
auditorApiService.syncModifyNameOrPhone(userDTO.getUserId(), tabUser.getEnterpriseId(), userDTO.getPhoneNumber(), userDTO.getUserName(), null); auditorApiService.syncModifyNameOrPhone(userDTO.getUserId(), tabUser.getEnterpriseId(), userDTO.getPhoneNumber(), userDTO.getUserName(), null);
ServiceResponse response = saveRole(userDTO.getUserId(), userDTO.getEnterpriseId(), userDTO.getUserRoleIds(), ServiceResponse response = saveRole(userDTO.getUserName(), userDTO.getUserId(), userDTO.getEnterpriseId(), userDTO.getUserRoleIds(),
userDTO.getUserResourceIds(), userDTO.getAccountGroupIds(), userDTO.getUserGroupIds()); userDTO.getUserResourceIds(), userDTO.getAccountGroupIds(), userDTO.getUserGroupIds());
if (response.isSuccess()) { if (response.isSuccess()) {
return response; return response;
...@@ -888,7 +888,7 @@ public class UserApiServiceImpl implements UserApiService { ...@@ -888,7 +888,7 @@ public class UserApiServiceImpl implements UserApiService {
* @param userResourceIds
 * @param userResourceIds

* @return com.gic.api.base.commons.ServiceResponse<java.lang.Integer>
 * @return com.gic.api.base.commons.ServiceResponse<java.lang.Integer>


 */ 
 */
private ServiceResponse<Integer> saveRole(Integer userId, Integer enterpriseId, String userRoleIds, private ServiceResponse<Integer> saveRole(String userName, Integer userId, Integer enterpriseId, String userRoleIds,
String userResourceIds, String accountGroupIds, String userGroupIds) { String userResourceIds, String accountGroupIds, String userGroupIds) {
String[] userRoleIdArr; String[] userRoleIdArr;
String[] userResourceIdArr; String[] userResourceIdArr;
...@@ -937,7 +937,7 @@ public class UserApiServiceImpl implements UserApiService { ...@@ -937,7 +937,7 @@ public class UserApiServiceImpl implements UserApiService {
} }
} }
//业务类型配置在:gic-member-config4.0.tab_conf_reference_type //业务类型配置在:gic-member-config4.0.tab_conf_reference_type
saveRefer(userId, 4, userRoleIdArr); saveRefer(userId, userName, 4, userRoleIdArr);
//新增用户资源关联数据 //新增用户资源关联数据
UserResourceDTO userResourceDTO = new UserResourceDTO(); UserResourceDTO userResourceDTO = new UserResourceDTO();
...@@ -956,7 +956,7 @@ public class UserApiServiceImpl implements UserApiService { ...@@ -956,7 +956,7 @@ public class UserApiServiceImpl implements UserApiService {
} }
} }
saveRefer(userId, 5, userResourceIdArr); saveRefer(userId, userName, 5, userResourceIdArr);
//账号分组用户关联数据维护 //账号分组用户关联数据维护
if (StringUtils.isNotBlank(accountGroupIds)) { if (StringUtils.isNotBlank(accountGroupIds)) {
...@@ -1003,10 +1003,10 @@ public class UserApiServiceImpl implements UserApiService { ...@@ -1003,10 +1003,10 @@ public class UserApiServiceImpl implements UserApiService {
* @param businessType 业务类型配置在:gic-member-config4.0.tab_conf_reference_type * @param businessType 业务类型配置在:gic-member-config4.0.tab_conf_reference_type
* @param businessReferIdArr * @param businessReferIdArr
*/ */
private void saveRefer(Integer businessId, Integer businessType, String[] businessReferIdArr) { private void saveRefer(Integer businessId, String businessName, Integer businessType, String[] businessReferIdArr) {
PopupDTO popupDTO = new PopupDTO(); PopupDTO popupDTO = new PopupDTO();
popupDTO.setBusinessId(String.valueOf(businessId)); popupDTO.setBusinessId(String.valueOf(businessId));
popupDTO.setBusinessName("管理员"); popupDTO.setBusinessName(businessName);
popupDTO.setBusinessType(9); popupDTO.setBusinessType(9);
if (businessReferIdArr != null && businessReferIdArr.length > 0) { if (businessReferIdArr != null && businessReferIdArr.length > 0) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment