yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/master'

master
dimengzhe 1 year ago
parent
7711ac4d28 38401b0998
commit
50302dea42
8 changed files with 141 additions and 43 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java
  2. 16
      anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysfunction/SysFunctionFeign.java
  3. 5
      anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysfunction/SysFunctionFeignFallback.java
  4. 13
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysfunction/SysFunctionMapper.java
  5. 28
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysfunction/SysFunctionMapper.xml
  6. 7
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysfunction/SysFunctionRest.java
  7. 45
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysfunction/SysFunctionService.java
  8. 62
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryService.java

8
anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java
View File

@ -801,17 +801,17 @@ public class CrmCustomerTempService extends MybatisBaseService<CrmCustomerTempMa
/* if (!mobile.matches("^((13[0-9])|(14[5,7])|(15[0-3,5-9])|(17[0,3,5-8])|(18[0-9])|166|198|199|(147))\\d{8}$")) {
return rb.setMsg("手机号格式不正确");
}*/
if (StringUtils.isNotBlank(dto.getIDNumber())) {
/*if (StringUtils.isNotBlank(dto.getIDNumber())) {
if (!weixin.matches("^[1-9]\\d{5}(18|19|([23]\\d))\\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\\d{3}[0-9Xx]$")) {
return rb.setMsg("证件号码格式不正确");
}
}
}*/
} else {
if (StringUtils.isNotBlank(dto.getIDNumber())) {
/*if (StringUtils.isNotBlank(dto.getIDNumber())) {
if (dto.getIDNumber().length() != 9 && dto.getIDNumber().length() != 18) {
return rb.setMsg("证件号码格式不正确");
}
}
}*/
}
if (StringUtils.isNotBlank(weixin)) {
if (!weixin.matches("^[a-zA-Z]{1}[-_a-zA-Z0-9]{5,19}$") && !weixin.matches("^((13[0-9])|(14[5,7])|(15[0-3,5-9])|(17[0,3,5-8])|(18[0-9])|166|198|199|(147))\\d{8}$")) {

16
anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysfunction/SysFunctionFeign.java
View File

@ -61,10 +61,10 @@ public interface SysFunctionFeign {
@ApiOperation("新增保存")
@PostMapping("/save")
public ResultBean save(@RequestBody SysFunctionDto dto);
@ApiOperation("修改保存")
@PostMapping("/update/{sid}")
public ResultBean update(@RequestBody SysFunctionDto dto,@PathVariable("sid") String sid);
public ResultBean update(@RequestBody SysFunctionDto dto, @PathVariable("sid") String sid);
@ApiOperation("修改功能的是否可用的状态")
@PostMapping("/updateIsEnable/{sid}/{isEnable}")
@ -73,6 +73,7 @@ public interface SysFunctionFeign {
@ApiOperation("删除记录")
@GetMapping("/del/{ids}")
public ResultBean del(@PathVariable("ids") String ids);
@ApiOperation("删除记录")
@GetMapping("/delBySids/{sids}")
public ResultBean delBySids(@PathVariable("sids") String sids);
@ -80,12 +81,19 @@ public interface SysFunctionFeign {
@ApiOperation("获取一条记录")
@GetMapping("/fetch/{id}")
public ResultBean<SysFunctionVo> fetch(@PathVariable("id") String id);
@ApiOperation("获取一条记录")
@GetMapping("/fetchBySid/{sid}")
public ResultBean<SysFunctionVo> fetchBySid(@PathVariable("sid") String sid);
@ApiOperation("角色授权时查询功能列表")
@ApiOperation("角色授权时查询功能列表（Pc）")
@GetMapping("/getFunctionAuthorization/{roleSid}")
public ResultBean<List<Map<String,Object>>> getFunctionAuthorization(@PathVariable("roleSid") String roleSid);
public ResultBean<List<Map<String, Object>>> getFunctionAuthorization(@PathVariable("roleSid") String roleSid);
@ApiOperation("角色授权时查询功能列表（App）")
@GetMapping("/getFunctionAuthorizationApp/{roleSid}")
public ResultBean<List<Map<String, Object>>> getFunctionAuthorizationApp(@PathVariable("roleSid") String roleSid);
@ApiOperation("查询按钮的权限")
@PostMapping("/getButtonPermissions")
public ResultBean<List<ButtonPermissionVo>> getButtonPermissions(@RequestBody ButtonPermissionQuery query);

5
anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysfunction/SysFunctionFeignFallback.java
View File

@ -96,6 +96,11 @@ public class SysFunctionFeignFallback implements SysFunctionFeign {
return null;
}
@Override
public ResultBean<List<Map<String, Object>>> getFunctionAuthorizationApp(String roleSid) {
return null;
}
@Override
public ResultBean<List<ButtonPermissionVo>> getButtonPermissions(ButtonPermissionQuery query) {
return null;

13
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysfunction/SysFunctionMapper.java
View File

@ -57,15 +57,20 @@ public interface SysFunctionMapper extends BaseMapper<SysFunction> {
*/
int selectBySourceSid(@Param("isEnable") int isEnable, @Param("sourceSid") String sourceSid);
List<ButtonPermissionVo> getButtonPermissions(@Param("query")ButtonPermissionQuery query);
@Select("SELECT ss.sourceName,ss.sid FROM sys_source ss LEFT JOIN sys_source_role ssr ON ss.sid=ssr.sorceSid where ssr.rolesid=#{roleSid}")
List<Map<String, Object>> getSourceAuthorization(@Param("roleSid")String roleSid);
List<ButtonPermissionVo> getButtonPermissions(@Param("query") ButtonPermissionQuery query);
List<Map<String, Object>> getSourceAuthorization(@Param("roleSid") String roleSid);
@Select("SELECT sm.name,sm.sid,sm.pageUrl FROM sys_menu sm LEFT JOIN sys_source_menu ssm ON sm.sid=ssm.menuSid where ssm.sourceSid=#{sourceSid}")
List<Map<String, Object>> getMenuAuthorization(@Param("sourceSid") String sourceSid);
@Select("SELECT sf.name,sf.sid FROM sys_function sf WHERE sf.actionUrl= #{pageUrl}")
List<Map<String, Object>> getFunctionAuthorization(@Param("pageUrl") String pageUrl);
@Select("SELECT sf.name,sf.sid,IF(IFNULL(srf.id,0)<=0,1,0) checked FROM sys_function sf " +
" LEFT JOIN sys_role_function srf ON srf.functionSid=sf.sid " +
" WHERE sf.actionUrl= #{pageUrl} AND srf.roleSid = #{roleSid} ")
List<Map<String, Object>> getFunctionByRoleSid(@Param("pageUrl") String pageUrl,@Param("roleSid") String roleSid);
List<Map<String, Object>> getFunctionByRoleSid(@Param("pageUrl") String pageUrl, @Param("roleSid") String roleSid);
List<Map<String, Object>> getSourceAuthorizationApp(@Param("roleSid") String roleSid);
}

28
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysfunction/SysFunctionMapper.xml
View File

@ -72,4 +72,32 @@
ON sur.roleSid = srf.rolesid
WHERE sur.userSid = #{query.userSid})
</select>
<select id="getSourceAuthorization" resultType="java.util.Map">
SELECT DISTINCT ss.sourceName,
ss.sid
FROM sys_source ss
LEFT JOIN sys_source_role ssr
ON ss.sid = ssr.sorceSid
LEFT JOIN sys_source_function ssf
ON ssr.`sorceSid` = ssf.`sourceSid`
LEFT JOIN sys_function sf
ON ssf.`functionSid` = sf.sid
WHERE ssr.rolesid = #{roleSid}
AND sf.phoneFunction = '0'
</select>
<select id="getSourceAuthorizationApp" resultType="java.util.Map">
SELECT DISTINCT ss.sourceName,
ss.sid
FROM sys_source ss
LEFT JOIN sys_source_role ssr
ON ss.sid = ssr.sorceSid
LEFT JOIN sys_source_function ssf
ON ssr.`sorceSid` = ssf.`sourceSid`
LEFT JOIN sys_function sf
ON ssf.`functionSid` = sf.sid
WHERE ssr.rolesid = #{roleSid}
AND sf.phoneFunction = '1'
</select>
</mapper>

7
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysfunction/SysFunctionRest.java
View File

@ -201,6 +201,13 @@ public class SysFunctionRest implements SysFunctionFeign {
return rb.success().setData(list);
}
@Override
public ResultBean<List<Map<String, Object>>> getFunctionAuthorizationApp(String roleSid) {
ResultBean rb = ResultBean.fireFail();
List<Map<String,Object>> list=sysFunctionService.getFunctionAuthorizationApp(roleSid);
return rb.success().setData(list);
}
@Override
public ResultBean<List<ButtonPermissionVo>> getButtonPermissions(ButtonPermissionQuery query) {
ResultBean<List<ButtonPermissionVo>> rb = ResultBean.fireFail();

45
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysfunction/SysFunctionService.java
View File

@ -299,4 +299,49 @@ public class SysFunctionService extends MybatisBaseService<SysFunctionMapper, Sy
});
return list;
}
public List<Map<String, Object>> getFunctionAuthorizationApp(String roleSid) {
List<Map<String, Object>> list = new ArrayList<>();
List<Map<String, Object>> lsources = baseMapper.getSourceAuthorizationApp(roleSid);
lsources.forEach(f -> {
Map<String, Object> map = new HashMap<>();
map.put("name", f.get("sourceName").toString());
map.put("sid", f.get("sid").toString());
map.put("checked", "1");
list.add(map);
});
list.forEach(f -> {
List<Map<String, Object>> list2 = new ArrayList<>();
String sid = f.get("sid").toString();
List<Map<String, Object>> lmenus = baseMapper.getMenuAuthorization(sid);
lmenus.forEach(ff -> {
Map<String, Object> map = new HashMap<>();
if (ff.get("pageUrl") != null && com.yxt.common.base.utils.StringUtils.isNotBlank(ff.get("pageUrl").toString())) {
String pageUrl = ff.get("pageUrl").toString();
List<Map<String, Object>> lfuncs = baseMapper.getFunctionAuthorization(pageUrl);
List<Map<String, Object>> functionByRoleSid = baseMapper.getFunctionByRoleSid(pageUrl, roleSid);
if (lfuncs.size() > 0){
map.put("name", ff.get("name"));
String sids = ff.get("sid").toString();
map.put("sid", sids);
map.put("checked", "1");
map.put("children", new ArrayList<>());
for (Map<String, Object> lfunc : lfuncs) {
for (Map<String, Object> funByRole : functionByRoleSid) {
if (lfunc.get("sid").equals(funByRole.get("sid"))) {
lfunc.put("checked", "0");
}
}
lfunc.put("children", new ArrayList<>());
}
map.put("children", lfuncs);
list2.add(map);
}
}
});
f.put("children", list2);
});
return list;
}
}

62
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryService.java
View File

@ -790,37 +790,37 @@ public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymen
privilegeQuery.setMenuUrl(pagerQuery.getMenuUrl());
privilegeQuery.setUserSid(pagerQuery.getUserSid());
ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
// if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
// //数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
// String orgSidPath = pagerQuery.getOrgPath();
// orgSidPath = orgSidPath + "/";
// int i1 = orgSidPath.indexOf("/");
// int i2 = orgSidPath.indexOf("/", i1 + 1);
// int i3 = orgSidPath.indexOf("/", i2 + 1);
// int i4 = orgSidPath.indexOf("/", i3 + 1);
// String orgLevelKey = defaultIdReltBean.getData();
// if ("1".equals(orgLevelKey)) {
// orgSidPath = orgSidPath.substring(0, i1);
// qw.like("p.orgSidPath", orgSidPath);
// } else if ("2".equals(orgLevelKey)) {
// orgSidPath = orgSidPath.substring(0, i2);
// qw.like("p.orgSidPath", orgSidPath);
// } else if ("3".equals(orgLevelKey)) {
// orgSidPath = orgSidPath.substring(0, i3);
// qw.like("p.orgSidPath", orgSidPath);
// } else if ("4".equals(orgLevelKey)) {
// orgSidPath = orgSidPath.substring(0, i4);
// qw.like("p.orgSidPath", orgSidPath);
// } else if ("5".equals(orgLevelKey)) {
// qw.eq("p.salesUserSid", pagerQuery.getUserSid());
// } else {
// PagerVo<TransferPaymentVo> p = new PagerVo<>();
// return p;
// }
// } else {
// PagerVo<TransferPaymentVo> p = new PagerVo<>();
// return p;
// }
if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
//数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
String orgSidPath = pagerQuery.getOrgPath();
orgSidPath = orgSidPath + "/";
int i1 = orgSidPath.indexOf("/");
int i2 = orgSidPath.indexOf("/", i1 + 1);
int i3 = orgSidPath.indexOf("/", i2 + 1);
int i4 = orgSidPath.indexOf("/", i3 + 1);
String orgLevelKey = defaultIdReltBean.getData();
if ("1".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i1);
qw.like("p.orgSidPath", orgSidPath);
} else if ("2".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i2);
qw.like("p.orgSidPath", orgSidPath);
} else if ("3".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i3);
qw.like("p.orgSidPath", orgSidPath);
} else if ("4".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i4);
qw.like("p.orgSidPath", orgSidPath);
} else if ("5".equals(orgLevelKey)) {
qw.eq("p.salesUserSid", pagerQuery.getUserSid());
} else {
PagerVo<TransferPaymentVo> p = new PagerVo<>();
return p;
}
} else {
PagerVo<TransferPaymentVo> p = new PagerVo<>();
return p;
}
//=======================
if (StringUtils.isNotBlank(pagerQuery.getType())) {
String type = pagerQuery.getType();

Write Preview
Loading…
Cancel
Save