Commit b7750433 authored by fangxinjiang's avatar fangxinjiang

前端客服手机号码更新-fxj

parent 63947b73
...@@ -462,7 +462,6 @@ public class TSettleDomainController { ...@@ -462,7 +462,6 @@ public class TSettleDomainController {
} catch (UnsupportedEncodingException e) { } catch (UnsupportedEncodingException e) {
e.printStackTrace(); e.printStackTrace();
} }
log.error("jsonStr:"+jsonStr);
List<TDomainUpCsVo> list= JSONObject.parseArray(jsonStr, TDomainUpCsVo.class); List<TDomainUpCsVo> list= JSONObject.parseArray(jsonStr, TDomainUpCsVo.class);
return tSettleDomainService.updateProjectCsInfo(list); return tSettleDomainService.updateProjectCsInfo(list);
} }
......
...@@ -57,6 +57,10 @@ public class SysUserDeptPermission extends Model<SysUserDeptPermission> { ...@@ -57,6 +57,10 @@ public class SysUserDeptPermission extends Model<SysUserDeptPermission> {
@Schema(description = "关联项目名称") @Schema(description = "关联项目名称")
private String projectName; private String projectName;
@NotBlank(message = "关联项目ID 不能为空")
@Schema(description = "关联项目ID")
private String projectId;
@Schema(description = "归属系统 yifu-mvp、yifu-csp") @Schema(description = "归属系统 yifu-mvp、yifu-csp")
private String client; private String client;
......
...@@ -79,6 +79,10 @@ public class UserCspVO implements Serializable { ...@@ -79,6 +79,10 @@ public class UserCspVO implements Serializable {
@Schema(description = "关联项目名称") @Schema(description = "关联项目名称")
private String projectName; private String projectName;
@NotBlank(message = "关联项目ID 不能为空")
@Schema(description = "关联项目ID")
private String projectId;
@Schema(description = "归属系统 0 yifu-mvp 1 yifu-csp") @Schema(description = "归属系统 0 yifu-mvp 1 yifu-csp")
private String client; private String client;
......
...@@ -100,16 +100,19 @@ public class UserDeptPermissionController { ...@@ -100,16 +100,19 @@ public class UserDeptPermissionController {
@PostMapping("/relation") @PostMapping("/relation")
public R<String> relationUser(@RequestBody SysUserDeptPermission sysUserDeptPermission) { public R<String> relationUser(@RequestBody SysUserDeptPermission sysUserDeptPermission) {
if(Common.isEmpty(sysUserDeptPermission.getProjectNo())){ if(Common.isEmpty(sysUserDeptPermission.getProjectNo())){
R.failed("项目编码不能为空"); return R.failed("项目编码不能为空");
} }
if(Common.isEmpty(sysUserDeptPermission.getProjectName())){ if(Common.isEmpty(sysUserDeptPermission.getProjectName())){
R.failed("项目名称不能为空"); return R.failed("项目名称不能为空");
} }
if(Common.isEmpty(sysUserDeptPermission.getUserId())){ if(Common.isEmpty(sysUserDeptPermission.getUserId())){
R.failed("用户ID不能为空"); return R.failed("用户ID不能为空");
} }
if (Common.isEmpty(sysUserDeptPermission.getDeptId())){ if (Common.isEmpty(sysUserDeptPermission.getDeptId())){
R.failed("部门ID不能为空"); return R.failed("部门ID不能为空");
}
if (Common.isEmpty(sysUserDeptPermission.getProjectId())){
return R.failed("项目ID不能为空");
} }
return sysUserDeptPermissionService.relationUser(sysUserDeptPermission); return sysUserDeptPermissionService.relationUser(sysUserDeptPermission);
} }
......
...@@ -338,6 +338,7 @@ public class SysUserDeptPermissionServiceImpl extends ServiceImpl<SysUserDeptPer ...@@ -338,6 +338,7 @@ public class SysUserDeptPermissionServiceImpl extends ServiceImpl<SysUserDeptPer
authority.setProjectNo(projectNoStr); authority.setProjectNo(projectNoStr);
authority.setProjectName(tPermissionInfo.getProjectName()); authority.setProjectName(tPermissionInfo.getProjectName());
authority.setUserType(tPermissionInfo.getUserType()); authority.setUserType(tPermissionInfo.getUserType());
authority.setProjectId(tPermissionInfo.getProjectId());
if (CommonConstants.ZERO_STRING.equals(tPermissionInfo.getPermissionsType())) { if (CommonConstants.ZERO_STRING.equals(tPermissionInfo.getPermissionsType())) {
// 全部数据 // 全部数据
authority.setHaveAll(true); authority.setHaveAll(true);
...@@ -453,6 +454,7 @@ public class SysUserDeptPermissionServiceImpl extends ServiceImpl<SysUserDeptPer ...@@ -453,6 +454,7 @@ public class SysUserDeptPermissionServiceImpl extends ServiceImpl<SysUserDeptPer
permission.setProjectName(entity.getProjectName()); permission.setProjectName(entity.getProjectName());
permission.setProjectNo(entity.getProjectNo()); permission.setProjectNo(entity.getProjectNo());
permission.setUserType(entity.getUserType()); permission.setUserType(entity.getUserType());
permission.setProjectId(entity.getProjectId());
baseMapper.insert(permission); baseMapper.insert(permission);
if (Common.isNotNull(permission) && Common.isNotNull(permission.getUserId())){ if (Common.isNotNull(permission) && Common.isNotNull(permission.getUserId())){
return R.ok(Boolean.TRUE,CommonConstants.SAVE_SUCCESS); return R.ok(Boolean.TRUE,CommonConstants.SAVE_SUCCESS);
......
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
<result column="user_type" property="userType"/> <result column="user_type" property="userType"/>
<result column="permissions_type" property="permissionsType"/> <result column="permissions_type" property="permissionsType"/>
<result column="appoint_dept_scope" property="appointDeptScope"/> <result column="appoint_dept_scope" property="appointDeptScope"/>
<result column="project_id" property="projectId"/>
</resultMap> </resultMap>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
...@@ -40,7 +41,8 @@ ...@@ -40,7 +41,8 @@
a.client, a.client,
a.user_type, a.user_type,
a.permissions_type, a.permissions_type,
a.appoint_dept_scope a.appoint_dept_scope,
a.project_id
</sql> </sql>
<select id="getUserDeptPermission" resultMap="BaseResultMap"> <select id="getUserDeptPermission" resultMap="BaseResultMap">
......
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