Browse Source

问题修改

master
God 3 years ago
parent
commit
6fc2fc58fd
  1. 4
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerDto.java
  2. 2
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.xml
  3. 4
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java
  4. 12
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java
  5. 2
      anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmenurole/SysMenuRoleQuery.java
  6. 13
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmenu/SysMenuRest.java
  7. 217
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmenurole/SysMenuRoleService.java
  8. 4
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoService.java

4
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerDto.java

@ -52,8 +52,7 @@ public class BaseManufacturerDto implements Dto {
@Pattern(regexp = "^\\d{6}$", message = "邮编格式不正确")
private String zipCode;
@ApiModelProperty(value = "邮箱", required = false)
@Pattern(regexp = "^[0-9A-Za-z][\\.-_0-9A-Za-z]*@[0-9A-Za-z]+(?:\\.[0-9A-Za-z]+)+$", message = "邮箱格式不正确")
@ApiModelProperty(value = "邮箱")
private String email;
@ApiModelProperty(value = "联系人姓名", required = true)
@ -71,7 +70,6 @@ public class BaseManufacturerDto implements Dto {
private String contactTelePhone;
@ApiModelProperty(value = "微信号", required = true)
@NotBlank(message = "微信号不能为空")
private String weChatID;
@ApiModelProperty(value = "行业", required = false)

2
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.xml

@ -24,7 +24,7 @@
<select id="selectNumCode" resultType="int">
SELECT count(*)
FROM base_distributor
WHERE registNum = #{numCode}
WHERE registNum = #{numCode} and isDelete = 0
</select>
<!--导出经销商信息-->

4
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java

@ -312,9 +312,9 @@ public class BaseDistributorService extends MybatisBaseService<BaseDistributorMa
if (registNum.length() != 18 && registNum.length() != 9) {
return ResultBean.fireFail().setMsg("统一信用社会代码应为9位或18位");
}
if (new Date().before(dto.getSetUpTime())) {
/*if (new Date().before(dto.getSetUpTime())) {
return rb.setMsg("成立时间不能晚于当前时间");
}
}*/
BaseDistributor baseDistributor = new BaseDistributor();
BeanUtil.copyProperties(dto, baseDistributor);
String pDistributorName = baseDistributor.getPDistributorName();

12
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java

@ -292,8 +292,16 @@ public class BaseManufacturerService extends MybatisBaseService<BaseManufacturer
ResultBean rb = ResultBean.fireFail();
//查询厂商名称是否存在
String weChatID = dto.getWeChatID();
if (!weChatID.matches("^[a-zA-Z]{1}[-_a-zA-Z0-9]{5,19}$") && !weChatID.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(weChatID)){
if (!weChatID.matches("^[a-zA-Z]{1}[-_a-zA-Z0-9]{5,19}$") && !weChatID.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("微信号格式不正确");
}
}
String email = dto.getEmail();
if (StringUtils.isNotBlank(email)){
if (!email.matches("^[0-9A-Za-z][\\.-_0-9A-Za-z]*@[0-9A-Za-z]+(?:\\.[0-9A-Za-z]+)+$")){
return rb.setMsg("邮箱格式不正确");
}
}
String name = dto.getManufacturerName();
int count = this.selectCountByName(name);

2
anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmenurole/SysMenuRoleQuery.java

@ -35,4 +35,6 @@ public class SysMenuRoleQuery implements Query {
private List<String> roleSids;
@ApiModelProperty("资源sid")
private String sourceSid;
@ApiModelProperty("是否是系统管理员")
private String isAdmin;
}

13
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmenu/SysMenuRest.java

@ -6,8 +6,10 @@ import com.yxt.anrui.portal.api.syssource.SysSource;
import com.yxt.anrui.portal.api.syssource.SysSourceVo;
import com.yxt.anrui.portal.api.syssourcemenu.SysSourceMenu;
import com.yxt.anrui.portal.api.syssourcemenu.SysSourceMenuVo;
import com.yxt.anrui.portal.api.sysuserrole.SysUserRole;
import com.yxt.anrui.portal.api.sysuserrole.SysUserRoleVo;
import com.yxt.anrui.portal.biz.sysmenurole.SysMenuRoleService;
import com.yxt.anrui.portal.biz.sysrole.SysRoleService;
import com.yxt.anrui.portal.biz.syssource.SysSourceService;
import com.yxt.anrui.portal.biz.syssourcemenu.SysSourceMenuService;
import com.yxt.anrui.portal.biz.sysuser.SysUserService;
@ -56,6 +58,8 @@ public class SysMenuRest implements SysMenuFeign {
private SysMenuRoleService sysMenuRoleService;
@Autowired
private SysUserService sysUserService;
@Autowired
private SysRoleService sysRoleService;
@Override
public ResultBean<PagerVo<SysMenuVo>> listPage(@RequestBody PagerQuery<SysMenuQuery> pq) {
@ -81,6 +85,7 @@ public class SysMenuRest implements SysMenuFeign {
@Override
public ResultBean<List<Map<String, Object>>> sourcemenutree(SysMenuQuery query) {
ResultBean<List<Map<String, Object>>> rb = ResultBean.fireFail();
SysMenuRoleQuery orgRoleMenuQuery = new SysMenuRoleQuery();
List<Map<String, Object>> list = new ArrayList<>();
if (null == query)
return rb.setData(list);
@ -88,7 +93,13 @@ public class SysMenuRest implements SysMenuFeign {
//if业务角色存在,则查询业务角色的菜单列表,否则查询平台角色的菜单列表
List<SysUserRoleVo> userRole = sysUserRoleService.selectByUserSid(query.getUserSid());
List<String> roleSids = userRole.stream().map(s -> s.getRoleSid()).collect(Collectors.toList());
SysMenuRoleQuery orgRoleMenuQuery = new SysMenuRoleQuery();
for (String roleSid : roleSids) {
Integer type = sysRoleService.fetchBySid(roleSid).getType();
if (type == 1){
orgRoleMenuQuery.setIsAdmin("1");
break;
}
}
orgRoleMenuQuery.setRoleSids(roleSids);
orgRoleMenuQuery.setSourceSid(query.getSourceSid());
list = sysMenuRoleService.getSourceMenuTreeOfRoles(orgRoleMenuQuery, null);

217
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmenurole/SysMenuRoleService.java

@ -41,127 +41,132 @@ import java.util.stream.Collectors;
*/
@Service
public class SysMenuRoleService extends MybatisBaseService<SysMenuRoleMapper, SysMenuRole> {
@Autowired
private SysMenuService sysMenuService;
public PagerVo<SysMenuRole> listPage(PagerQuery<SysMenuRoleQuery> pq) {
SysMenuRoleQuery query = pq.getParams();
QueryWrapper<SysMenuRole> qw = createQueryWrapper(query);
IPage<SysMenuRole> page = PagerUtil.queryToPage(pq);
IPage<SysMenuRole> pagging = baseMapper.selectPage(page, qw);
PagerVo<SysMenuRole> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public List<SysMenuRole> listAll(SysMenuRoleQuery query) {
QueryWrapper<SysMenuRole> qw = createQueryWrapper(query);
return baseMapper.selectList(qw);
}
private QueryWrapper<SysMenuRole> createQueryWrapper(SysMenuRoleQuery query) {
// todo: 这里根据具体业务调整查询条件
// 多字段Like示例:qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
QueryWrapper<SysMenuRole> qw = new QueryWrapper<>();
if (StringUtils.isNotBlank(query.getMenuSid())) {
qw.eq("menuSid", query.getMenuSid());
}
if (StringUtils.isNotBlank(query.getRoleSid())) {
qw.eq("roleSid", query.getRoleSid());
}
return qw;
}
public PagerVo<SysMenuRoleVo> listPageVo(PagerQuery<SysMenuRoleQuery> pq) {
SysMenuRoleQuery query = pq.getParams();
QueryWrapper<SysMenuRole> qw = createQueryWrapper(query);
IPage<SysMenuRole> page = PagerUtil.queryToPage(pq);
IPage<SysMenuRoleVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<SysMenuRoleVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public List<SysMenuRoleVo> listAllVo(SysMenuRoleQuery query) {
QueryWrapper<SysMenuRole> qw = createQueryWrapper(query);
return baseMapper.selectListAllVo(qw);
}
public List<SysMenuRoleVo> listVo() {
return baseMapper.selectListVo();
}
public void saveOrUpdateDto(SysMenuRoleDto dto){
SysMenuRole entity = new SysMenuRole();
dto.fillEntity(entity);
this.saveOrUpdate(entity);
}
public SysMenuRoleVo fetchByIdVo(String id){
SysMenuRole entity = this.fetchById(id);
SysMenuRoleVo vo = new SysMenuRoleVo();
BeanUtil.copyProperties(entity, vo);
return vo;
}
@Autowired
private SysMenuService sysMenuService;
public PagerVo<SysMenuRole> listPage(PagerQuery<SysMenuRoleQuery> pq) {
SysMenuRoleQuery query = pq.getParams();
QueryWrapper<SysMenuRole> qw = createQueryWrapper(query);
IPage<SysMenuRole> page = PagerUtil.queryToPage(pq);
IPage<SysMenuRole> pagging = baseMapper.selectPage(page, qw);
PagerVo<SysMenuRole> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public List<SysMenuRole> listAll(SysMenuRoleQuery query) {
QueryWrapper<SysMenuRole> qw = createQueryWrapper(query);
return baseMapper.selectList(qw);
}
private QueryWrapper<SysMenuRole> createQueryWrapper(SysMenuRoleQuery query) {
// todo: 这里根据具体业务调整查询条件
// 多字段Like示例:qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
QueryWrapper<SysMenuRole> qw = new QueryWrapper<>();
if (StringUtils.isNotBlank(query.getMenuSid())) {
qw.eq("menuSid", query.getMenuSid());
}
if (StringUtils.isNotBlank(query.getRoleSid())) {
qw.eq("roleSid", query.getRoleSid());
}
return qw;
}
public PagerVo<SysMenuRoleVo> listPageVo(PagerQuery<SysMenuRoleQuery> pq) {
SysMenuRoleQuery query = pq.getParams();
QueryWrapper<SysMenuRole> qw = createQueryWrapper(query);
IPage<SysMenuRole> page = PagerUtil.queryToPage(pq);
IPage<SysMenuRoleVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<SysMenuRoleVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public List<SysMenuRoleVo> listAllVo(SysMenuRoleQuery query) {
QueryWrapper<SysMenuRole> qw = createQueryWrapper(query);
return baseMapper.selectListAllVo(qw);
}
public List<SysMenuRoleVo> listVo() {
return baseMapper.selectListVo();
}
public void saveOrUpdateDto(SysMenuRoleDto dto) {
SysMenuRole entity = new SysMenuRole();
dto.fillEntity(entity);
this.saveOrUpdate(entity);
}
public SysMenuRoleVo fetchByIdVo(String id) {
SysMenuRole entity = this.fetchById(id);
SysMenuRoleVo vo = new SysMenuRoleVo();
BeanUtil.copyProperties(entity, vo);
return vo;
}
public void delByRoleSid(String roleSid) {
baseMapper.delByRoleSid(roleSid);
baseMapper.delByRoleSid(roleSid);
}
// 不分页列表
public List<SysMenuRoleVo> list(SysMenuRoleQuery query) {
// mybits所用的查询条件封装类
QueryWrapper<SysMenuRoleVo> qw = buildQueryWrapper(query);
return baseMapper.list(qw);
}
/**
* 解析和组装查询条件封装在qw中
*
* @param query
* @return
*/
private QueryWrapper<SysMenuRoleVo> buildQueryWrapper(SysMenuRoleQuery query) {
QueryWrapper<SysMenuRoleVo> qw = new QueryWrapper<>();
if (query != null) {
if (org.apache.commons.lang3.StringUtils.isNotBlank(query.getSourceSid())) {
qw.eq("m.sourceSid", query.getSourceSid());
}
// 不分页列表
public List<SysMenuRoleVo> list(SysMenuRoleQuery query) {
// mybits所用的查询条件封装类
QueryWrapper<SysMenuRoleVo> qw = buildQueryWrapper(query);
return baseMapper.list(qw);
}
/**
* 解析和组装查询条件封装在qw中
*
* @param query
* @return
*/
private QueryWrapper<SysMenuRoleVo> buildQueryWrapper(SysMenuRoleQuery query) {
QueryWrapper<SysMenuRoleVo> qw = new QueryWrapper<>();
if (query != null) {
if (org.apache.commons.lang3.StringUtils.isNotBlank(query.getSourceSid())) {
qw.eq("m.sourceSid", query.getSourceSid());
}
/*if (org.apache.commons.lang3.StringUtils.isNotBlank(query.getRoleSid())) {
qw.in("rm.roleSid", query.getRoleSid());
}*/
if (query.getRoleSids()!=null&&query.getRoleSids().size()>0) {
qw.in("rm.roleSid", query.getRoleSids());
}
qw.eq("m.isShow", 1);
if (StringUtils.isBlank(query.getIsAdmin())) {
qw.eq("m.isEnable", 1);
}
qw.orderByAsc("m.sortNo");
}
if (query.getRoleSids() != null && query.getRoleSids().size() > 0) {
qw.in("rm.roleSid", query.getRoleSids());
}
qw.eq("m.isShow", 1);
qw.orderByAsc("m.sortNo");
}
return qw;
return qw;
}
/**
* 资源菜单树形列表
* @param query:roleSids,sourceSid
* @return 资源菜单树形列表第一级一级菜单 第二级二级菜单
*/
public List<Map<String, Object>> getSourceMenuTreeOfRoles(SysMenuRoleQuery query,Map<String, Object> map_rolemenus) {
}
//获取当前资源的菜单列表
List<Map<String, Object>> list_menus_map = new ArrayList<Map<String, Object>>();
if(null==query)
return list_menus_map;
/**
* 资源菜单树形列表
*
* @param query:roleSids,sourceSid
* @return 资源菜单树形列表第一级一级菜单 第二级二级菜单
*/
public List<Map<String, Object>> getSourceMenuTreeOfRoles(SysMenuRoleQuery query, Map<String, Object> map_rolemenus) {
//角色s的某个资源的所有菜单列表
List<SysMenuRoleVo> list_menu = list(query);
list_menus_map= sysMenuService.getSourceMenuTree(list_menu, map_rolemenus);
//获取当前资源的菜单列表
List<Map<String, Object>> list_menus_map = new ArrayList<Map<String, Object>>();
if (null == query)
return list_menus_map;
return list_menus_map;
//角色s的某个资源的所有菜单列表
List<SysMenuRoleVo> list_menu = list(query);
list_menus_map = sysMenuService.getSourceMenuTree(list_menu, map_rolemenus);
}
///----获平台角色s的某个资源的菜单树形列表(内存操作) 开始----
return list_menus_map;
}
///----获平台角色s的某个资源的菜单树形列表(内存操作) 开始----
}

4
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoService.java

@ -237,6 +237,10 @@ public class SysStaffinfoService extends MybatisBaseService<SysStaffinfoMapper,
if (dto.getSysStaffPost() == null) {
return rb.setMsg("员工岗位信息不能为空");
}
Date joinCompnyDate = dto.getJoinCompnyDate();
if (joinCompnyDate == null){
return rb.setMsg("员工入职日期不能为空");
}
//添加员工基础信息
SysStaffinfo sysStaffinfo3 = new SysStaffinfo();
dto.fillEntity(sysStaffinfo3);

Loading…
Cancel
Save