From 526021e88e4aef4d193e8bfcbcda717360472942 Mon Sep 17 00:00:00 2001 From: tamguo Date: Tue, 24 Jul 2018 18:37:08 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tamguo/modules/sys/dao/SysMenuMapper.java | 20 -- .../tamguo/modules/sys/dao/SysPostMapper.java | 1 - .../tamguo/modules/sys/dao/SysRoleMapper.java | 12 - .../modules/sys/model/SysMenuEntity.java | 109 ------- .../modules/sys/model/SysOfficeEntity.java | 270 +++++++++++++----- .../modules/sys/model/SysPostEntity.java | 149 ++++++---- .../modules/sys/model/SysRoleEntity.java | 52 ---- .../sys/model/condition/SysUserCondition.java | 107 +++---- .../modules/sys/service/ISysRoleService.java | 21 -- .../sys/service/impl/PostServiceImpl.java | 6 - .../sys/service/impl/SysRoleServiceImpl.java | 60 ---- .../sys/service/impl/SysUserServiceImpl.java | 10 - .../main/resources/mappers/SysMenuMapper.xml | 37 --- .../resources/mappers/SysOfficeMapper.xml | 19 +- .../main/resources/mappers/SysPostMapper.xml | 22 +- .../main/resources/mappers/SysRoleMapper.xml | 17 -- .../templates/modules/sys/company/index.html | 14 +- .../templates/modules/sys/office/index.html | 12 +- .../templates/modules/sys/user/list.html | 19 +- 19 files changed, 388 insertions(+), 569 deletions(-) delete mode 100644 tamguo-oms/src/main/java/com/tamguo/modules/sys/dao/SysMenuMapper.java delete mode 100644 tamguo-oms/src/main/java/com/tamguo/modules/sys/dao/SysRoleMapper.java delete mode 100644 tamguo-oms/src/main/java/com/tamguo/modules/sys/model/SysMenuEntity.java delete mode 100644 tamguo-oms/src/main/java/com/tamguo/modules/sys/model/SysRoleEntity.java delete mode 100644 tamguo-oms/src/main/java/com/tamguo/modules/sys/service/ISysRoleService.java delete mode 100644 tamguo-oms/src/main/java/com/tamguo/modules/sys/service/impl/SysRoleServiceImpl.java delete mode 100644 tamguo-oms/src/main/resources/mappers/SysMenuMapper.xml delete mode 100644 tamguo-oms/src/main/resources/mappers/SysRoleMapper.xml diff --git a/tamguo-oms/src/main/java/com/tamguo/modules/sys/dao/SysMenuMapper.java b/tamguo-oms/src/main/java/com/tamguo/modules/sys/dao/SysMenuMapper.java deleted file mode 100644 index 7f0e8ce..0000000 --- a/tamguo-oms/src/main/java/com/tamguo/modules/sys/dao/SysMenuMapper.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.tamguo.modules.sys.dao; - -import java.util.List; -import java.util.Map; - -import com.baomidou.mybatisplus.plugins.pagination.Pagination; -import com.tamguo.config.dao.SuperMapper; -import com.tamguo.modules.sys.model.SysMenuEntity; - -public interface SysMenuMapper extends SuperMapper{ - - List queryList(Map hashMap , Pagination page); - - List queryNotButtonList(); - - SysMenuEntity queryByParentId(String parentId); - - SysMenuEntity queryByUid(String uid); - -} diff --git a/tamguo-oms/src/main/java/com/tamguo/modules/sys/dao/SysPostMapper.java b/tamguo-oms/src/main/java/com/tamguo/modules/sys/dao/SysPostMapper.java index af5f998..9e621b0 100644 --- a/tamguo-oms/src/main/java/com/tamguo/modules/sys/dao/SysPostMapper.java +++ b/tamguo-oms/src/main/java/com/tamguo/modules/sys/dao/SysPostMapper.java @@ -1,7 +1,6 @@ package com.tamguo.modules.sys.dao; import java.util.List; - import com.baomidou.mybatisplus.plugins.pagination.Pagination; import com.tamguo.config.dao.SuperMapper; import com.tamguo.modules.sys.model.SysPostEntity; diff --git a/tamguo-oms/src/main/java/com/tamguo/modules/sys/dao/SysRoleMapper.java b/tamguo-oms/src/main/java/com/tamguo/modules/sys/dao/SysRoleMapper.java deleted file mode 100644 index 37cf39f..0000000 --- a/tamguo-oms/src/main/java/com/tamguo/modules/sys/dao/SysRoleMapper.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.tamguo.modules.sys.dao; - -import java.util.List; -import com.baomidou.mybatisplus.plugins.pagination.Pagination; -import com.tamguo.config.dao.SuperMapper; -import com.tamguo.modules.sys.model.SysRoleEntity; - -public interface SysRoleMapper extends SuperMapper{ - - List selectPageByName(SysRoleEntity sysRoleEntity, Pagination page); - -} diff --git a/tamguo-oms/src/main/java/com/tamguo/modules/sys/model/SysMenuEntity.java b/tamguo-oms/src/main/java/com/tamguo/modules/sys/model/SysMenuEntity.java deleted file mode 100644 index 07e8596..0000000 --- a/tamguo-oms/src/main/java/com/tamguo/modules/sys/model/SysMenuEntity.java +++ /dev/null @@ -1,109 +0,0 @@ -package com.tamguo.modules.sys.model; - -import java.io.Serializable; -import java.util.List; - -import com.baomidou.mybatisplus.annotations.TableField; -import com.baomidou.mybatisplus.annotations.TableName; -import com.tamguo.config.dao.SuperEntity; - -/** - * The persistent class for the reaps_sys_menu database table. - * - */ -@TableName(value="sys_menu") -public class SysMenuEntity extends SuperEntity implements Serializable { - private static final long serialVersionUID = 1L; - - private String name; - private Integer orderNum; - private String parentId; - private Integer type; - private String url; - private String perms; - - @TableField(exist=false) - private List menuList; - - @TableField(exist=false) - private String parentName; - - @TableField(exist=false) - private Boolean open; - - public SysMenuEntity() { - } - - public String getName() { - return this.name; - } - - public void setName(String name) { - this.name = name; - } - - public Integer getOrderNum() { - return this.orderNum; - } - - public void setOrderNum(Integer orderNum) { - this.orderNum = orderNum; - } - - public String getParentId() { - return this.parentId; - } - - public void setParentId(String parentId) { - this.parentId = parentId; - } - - public Integer getType() { - return this.type; - } - - public void setType(Integer type) { - this.type = type; - } - - public String getUrl() { - return this.url; - } - - public void setUrl(String url) { - this.url = url; - } - - public List getMenuList() { - return menuList; - } - - public void setMenuList(List menuList) { - this.menuList = menuList; - } - - public String getParentName() { - return parentName; - } - - public void setParentName(String parentName) { - this.parentName = parentName; - } - - public Boolean getOpen() { - return open; - } - - public void setOpen(Boolean open) { - this.open = open; - } - - public String getPerms() { - return perms; - } - - public void setPerms(String perms) { - this.perms = perms; - } - -} \ No newline at end of file diff --git a/tamguo-oms/src/main/java/com/tamguo/modules/sys/model/SysOfficeEntity.java b/tamguo-oms/src/main/java/com/tamguo/modules/sys/model/SysOfficeEntity.java index 2980671..6fcad8b 100644 --- a/tamguo-oms/src/main/java/com/tamguo/modules/sys/model/SysOfficeEntity.java +++ b/tamguo-oms/src/main/java/com/tamguo/modules/sys/model/SysOfficeEntity.java @@ -1,111 +1,247 @@ package com.tamguo.modules.sys.model; import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; import com.baomidou.mybatisplus.annotations.TableName; -import com.tamguo.config.dao.SuperEntity; -import com.tamguo.modules.sys.model.enums.SysOfficeStatusEnum; -import com.tamguo.modules.sys.model.enums.SysOfficeTypeEnum; -@TableName(value="sys_office") -public class SysOfficeEntity extends SuperEntity implements Serializable{ +/** + * The persistent class for the sys_office database table. + * + */ +@TableName(value="sys_office") +public class SysOfficeEntity implements Serializable { private static final long serialVersionUID = 1L; - - private String parentId; - private String name; - private String fullName; + private String officeCode; - private Integer sorts; - private SysOfficeTypeEnum sysOfficeTypeEnum; - private String leader; - private String tel; private String address; - private String zipCode; + private String corpCode; + private String corpName; + private String createBy; + private Date createDate; private String email; + private String fullName; + private String leader; + private String officeName; + private String officeType; + private String parentCode; + private String parentCodes; + private String phone; private String remarks; - private SysOfficeStatusEnum sysOfficeStatusEnum; - - public String getParentId() { - return parentId; + private String status; + private String treeLeaf; + private BigDecimal treeLevel; + private String treeNames; + private BigDecimal treeSort; + private String treeSorts; + private String updateBy; + private Date updateDate; + private String viewCode; + private String zipCode; + + public SysOfficeEntity() { } - public void setParentId(String parentId) { - this.parentId = parentId; + + public String getOfficeCode() { + return this.officeCode; } - public String getName() { - return name; + + public void setOfficeCode(String officeCode) { + this.officeCode = officeCode; } - public void setName(String name) { - this.name = name; + + public String getAddress() { + return this.address; } - public String getFullName() { - return fullName; + + public void setAddress(String address) { + this.address = address; } - public void setFullName(String fullName) { - this.fullName = fullName; + + public String getCorpCode() { + return this.corpCode; } - public String getOfficeCode() { - return officeCode; + + public void setCorpCode(String corpCode) { + this.corpCode = corpCode; } - public void setOfficeCode(String officeCode) { - this.officeCode = officeCode; + + public String getCorpName() { + return this.corpName; } - public Integer getSorts() { - return sorts; + + public void setCorpName(String corpName) { + this.corpName = corpName; + } + + public String getCreateBy() { + return this.createBy; } - public void setSorts(Integer sorts) { - this.sorts = sorts; + + public void setCreateBy(String createBy) { + this.createBy = createBy; } - public SysOfficeTypeEnum getSysOfficeTypeEnum() { - return sysOfficeTypeEnum; + + public Date getCreateDate() { + return this.createDate; } - public void setSysOfficeTypeEnum(SysOfficeTypeEnum sysOfficeTypeEnum) { - this.sysOfficeTypeEnum = sysOfficeTypeEnum; + + public void setCreateDate(Date createDate) { + this.createDate = createDate; } + + public String getEmail() { + return this.email; + } + + public void setEmail(String email) { + this.email = email; + } + + public String getFullName() { + return this.fullName; + } + + public void setFullName(String fullName) { + this.fullName = fullName; + } + public String getLeader() { - return leader; + return this.leader; } + public void setLeader(String leader) { this.leader = leader; } - public String getTel() { - return tel; + + public String getOfficeName() { + return this.officeName; } - public void setTel(String tel) { - this.tel = tel; + + public void setOfficeName(String officeName) { + this.officeName = officeName; } - public String getAddress() { - return address; + + public String getOfficeType() { + return this.officeType; } - public void setAddress(String address) { - this.address = address; + + public void setOfficeType(String officeType) { + this.officeType = officeType; } - public String getZipCode() { - return zipCode; + + public String getParentCode() { + return this.parentCode; } - public void setZipCode(String zipCode) { - this.zipCode = zipCode; + + public void setParentCode(String parentCode) { + this.parentCode = parentCode; } - public String getEmail() { - return email; + + public String getParentCodes() { + return this.parentCodes; } - public void setEmail(String email) { - this.email = email; + + public void setParentCodes(String parentCodes) { + this.parentCodes = parentCodes; + } + + public String getPhone() { + return this.phone; } + + public void setPhone(String phone) { + this.phone = phone; + } + public String getRemarks() { - return remarks; + return this.remarks; } + public void setRemarks(String remarks) { this.remarks = remarks; } - public SysOfficeStatusEnum getSysOfficeStatusEnum() { - return sysOfficeStatusEnum; + + public String getStatus() { + return this.status; + } + + public void setStatus(String status) { + this.status = status; + } + + public String getTreeLeaf() { + return this.treeLeaf; + } + + public void setTreeLeaf(String treeLeaf) { + this.treeLeaf = treeLeaf; + } + + public BigDecimal getTreeLevel() { + return this.treeLevel; + } + + public void setTreeLevel(BigDecimal treeLevel) { + this.treeLevel = treeLevel; + } + + public String getTreeNames() { + return this.treeNames; + } + + public void setTreeNames(String treeNames) { + this.treeNames = treeNames; + } + + public BigDecimal getTreeSort() { + return this.treeSort; + } + + public void setTreeSort(BigDecimal treeSort) { + this.treeSort = treeSort; + } + + public String getTreeSorts() { + return this.treeSorts; } - public void setSysOfficeStatusEnum(SysOfficeStatusEnum sysOfficeStatusEnum) { - this.sysOfficeStatusEnum = sysOfficeStatusEnum; + + public void setTreeSorts(String treeSorts) { + this.treeSorts = treeSorts; + } + + public String getUpdateBy() { + return this.updateBy; + } + + public void setUpdateBy(String updateBy) { + this.updateBy = updateBy; + } + + public Date getUpdateDate() { + return this.updateDate; } - public static long getSerialversionuid() { - return serialVersionUID; - } - -} + + public void setUpdateDate(Date updateDate) { + this.updateDate = updateDate; + } + + public String getViewCode() { + return this.viewCode; + } + + public void setViewCode(String viewCode) { + this.viewCode = viewCode; + } + + public String getZipCode() { + return this.zipCode; + } + + public void setZipCode(String zipCode) { + this.zipCode = zipCode; + } + +} \ No newline at end of file diff --git a/tamguo-oms/src/main/java/com/tamguo/modules/sys/model/SysPostEntity.java b/tamguo-oms/src/main/java/com/tamguo/modules/sys/model/SysPostEntity.java index a2847ea..53df6a7 100644 --- a/tamguo-oms/src/main/java/com/tamguo/modules/sys/model/SysPostEntity.java +++ b/tamguo-oms/src/main/java/com/tamguo/modules/sys/model/SysPostEntity.java @@ -1,84 +1,131 @@ package com.tamguo.modules.sys.model; import java.io.Serializable; +import java.math.BigDecimal; import java.util.Date; -import com.alibaba.fastjson.annotation.JSONField; -import com.alibaba.fastjson.serializer.SerializerFeature; import com.baomidou.mybatisplus.annotations.TableName; -import com.tamguo.config.dao.SuperEntity; import com.tamguo.modules.sys.model.enums.SysPostStatusEnum; -import com.tamguo.modules.sys.model.enums.SysPostTypeEnum; -@TableName(value="sys_post") -public class SysPostEntity extends SuperEntity implements Serializable{ +/** + * The persistent class for the sys_post database table. + * + */ +@TableName(value="sys_post") +public class SysPostEntity implements Serializable { private static final long serialVersionUID = 1L; - - private String name; - private String code; - - @JSONField(serialzeFeatures= SerializerFeature.WriteEnumUsingToString) - private SysPostTypeEnum postType; - - private Integer sorts; - private String remarks; + + private String postCode; + private String corpCode; + private String corpName; + private String createBy; private Date createDate; - private Date updateDate; - - @JSONField(serialzeFeatures= SerializerFeature.WriteEnumUsingToString) + private String postName; + private BigDecimal postSort; + private String postType; + private String remarks; private SysPostStatusEnum status; - - public String getName() { - return name; - } - public void setName(String name) { - this.name = name; - } - public String getCode() { - return code; + private String updateBy; + private Date updateDate; + + public SysPostEntity() { } - public void setCode(String code) { - this.code = code; + + public String getPostCode() { + return this.postCode; } - public SysPostTypeEnum getPostType() { - return postType; + + public void setPostCode(String postCode) { + this.postCode = postCode; } - public void setPostType(String postType) { - this.postType = SysPostTypeEnum.getPostType(postType); + + public String getCorpCode() { + return this.corpCode; } - public Integer getSorts() { - return sorts; + + public void setCorpCode(String corpCode) { + this.corpCode = corpCode; } - public void setSorts(Integer sorts) { - this.sorts = sorts; + + public String getCorpName() { + return this.corpName; } - public String getRemarks() { - return remarks; + + public void setCorpName(String corpName) { + this.corpName = corpName; } - public void setRemarks(String remarks) { - this.remarks = remarks; + + public String getCreateBy() { + return this.createBy; } - public static long getSerialversionuid() { - return serialVersionUID; + + public void setCreateBy(String createBy) { + this.createBy = createBy; } + public Date getCreateDate() { - return createDate; + return this.createDate; } + public void setCreateDate(Date createDate) { this.createDate = createDate; } - public Date getUpdateDate() { - return updateDate; + + public String getPostName() { + return this.postName; } - public void setUpdateDate(Date updateDate) { - this.updateDate = updateDate; + + public void setPostName(String postName) { + this.postName = postName; } + + public BigDecimal getPostSort() { + return this.postSort; + } + + public void setPostSort(BigDecimal postSort) { + this.postSort = postSort; + } + + public String getPostType() { + return this.postType; + } + + public void setPostType(String postType) { + this.postType = postType; + } + + public String getRemarks() { + return this.remarks; + } + + public void setRemarks(String remarks) { + this.remarks = remarks; + } + public SysPostStatusEnum getStatus() { - return status; + return this.status; } + public void setStatus(SysPostStatusEnum status) { this.status = status; } - -} + + public String getUpdateBy() { + return this.updateBy; + } + + public void setUpdateBy(String updateBy) { + this.updateBy = updateBy; + } + + public Date getUpdateDate() { + return this.updateDate; + } + + public void setUpdateDate(Date updateDate) { + this.updateDate = updateDate; + } + +} \ No newline at end of file diff --git a/tamguo-oms/src/main/java/com/tamguo/modules/sys/model/SysRoleEntity.java b/tamguo-oms/src/main/java/com/tamguo/modules/sys/model/SysRoleEntity.java deleted file mode 100644 index a53b793..0000000 --- a/tamguo-oms/src/main/java/com/tamguo/modules/sys/model/SysRoleEntity.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.tamguo.modules.sys.model; - -import java.io.Serializable; -import java.util.List; - -import com.baomidou.mybatisplus.annotations.TableField; -import com.baomidou.mybatisplus.annotations.TableName; -import com.tamguo.config.dao.SuperEntity; - - -/** - * The persistent class for the reaps_sys_role database table. - * - */ -@TableName(value="sys_role") -public class SysRoleEntity extends SuperEntity implements Serializable { - private static final long serialVersionUID = 1L; - - private String perms; - private String name; - - @TableField(exist=false) - private List menuIdList; - - public SysRoleEntity() { - } - - public String getName() { - return this.name; - } - - public void setName(String name) { - this.name = name; - } - - public List getMenuIdList() { - return menuIdList; - } - - public void setMenuIdList(List menuIdList) { - this.menuIdList = menuIdList; - } - - public String getPerms() { - return perms; - } - - public void setPerms(String perms) { - this.perms = perms; - } - -} \ No newline at end of file diff --git a/tamguo-oms/src/main/java/com/tamguo/modules/sys/model/condition/SysUserCondition.java b/tamguo-oms/src/main/java/com/tamguo/modules/sys/model/condition/SysUserCondition.java index 6d8d52f..9484dab 100644 --- a/tamguo-oms/src/main/java/com/tamguo/modules/sys/model/condition/SysUserCondition.java +++ b/tamguo-oms/src/main/java/com/tamguo/modules/sys/model/condition/SysUserCondition.java @@ -2,97 +2,104 @@ package com.tamguo.modules.sys.model.condition; public class SysUserCondition { - private String companyCode; - private String companyName; + private Integer pageNo; + private Integer pageSize; + + private String loginCode; private String userName; - private String nickName; - private String name; private String email; private String mobile; + private String phone; + private String refName; + private String officeName; + private String officeCode; + private String companyCode; + private String companyName; + private String postCode; private String status; - - private Integer pageNo; - private Integer pageSize; - public Integer getPageNo() { return pageNo; } - public void setPageNo(Integer pageNo) { this.pageNo = pageNo; } - public Integer getPageSize() { return pageSize; } - public void setPageSize(Integer pageSize) { this.pageSize = pageSize; } - + public String getLoginCode() { + return loginCode; + } + public void setLoginCode(String loginCode) { + this.loginCode = loginCode; + } public String getUserName() { return userName; } - public void setUserName(String userName) { this.userName = userName; } - + public String getEmail() { + return email; + } + public void setEmail(String email) { + this.email = email; + } + public String getMobile() { + return mobile; + } + public void setMobile(String mobile) { + this.mobile = mobile; + } + public String getPhone() { + return phone; + } + public void setPhone(String phone) { + this.phone = phone; + } + public String getRefName() { + return refName; + } + public void setRefName(String refName) { + this.refName = refName; + } + public String getOfficeName() { + return officeName; + } + public void setOfficeName(String officeName) { + this.officeName = officeName; + } + public String getOfficeCode() { + return officeCode; + } + public void setOfficeCode(String officeCode) { + this.officeCode = officeCode; + } public String getCompanyCode() { return companyCode; } - public void setCompanyCode(String companyCode) { this.companyCode = companyCode; } - public String getCompanyName() { return companyName; } - public void setCompanyName(String companyName) { this.companyName = companyName; } - - public String getNickName() { - return nickName; + public String getPostCode() { + return postCode; } - - public void setNickName(String nickName) { - this.nickName = nickName; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; + public void setPostCode(String postCode) { + this.postCode = postCode; } - - public String getEmail() { - return email; - } - - public void setEmail(String email) { - this.email = email; - } - - public String getMobile() { - return mobile; - } - - public void setMobile(String mobile) { - this.mobile = mobile; - } - public String getStatus() { return status; } - public void setStatus(String status) { this.status = status; } - } diff --git a/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/ISysRoleService.java b/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/ISysRoleService.java deleted file mode 100644 index ec193ca..0000000 --- a/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/ISysRoleService.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.tamguo.modules.sys.service; - -import java.util.List; -import com.baomidou.mybatisplus.plugins.Page; -import com.tamguo.modules.sys.model.SysRoleEntity; - -public interface ISysRoleService { - - public List findAll(); - - public Page queryList(SysRoleEntity role, Page page); - - public SysRoleEntity select(String uid); - - public void save(SysRoleEntity role); - - public void update(SysRoleEntity role); - - public void deleteBatch(String[] roleIds); - -} diff --git a/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/impl/PostServiceImpl.java b/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/impl/PostServiceImpl.java index d42dbb7..1e8f8a3 100644 --- a/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/impl/PostServiceImpl.java +++ b/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/impl/PostServiceImpl.java @@ -37,12 +37,6 @@ public class PostServiceImpl extends ServiceImpl i @Transactional(readOnly=false) @Override public void update(SysPostEntity post) { - SysPostEntity entity = sysPostMapper.selectById(post.getId()); - entity.setCode(post.getCode()); - entity.setName(post.getName()); - entity.setPostType(post.getPostType().getValue().toString()); - entity.setRemarks(post.getRemarks()); - entity.setSorts(post.getSorts()); post.setUpdateDate(new Date()); sysPostMapper.updateById(post); } diff --git a/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/impl/SysRoleServiceImpl.java b/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/impl/SysRoleServiceImpl.java deleted file mode 100644 index e717e3e..0000000 --- a/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/impl/SysRoleServiceImpl.java +++ /dev/null @@ -1,60 +0,0 @@ -package com.tamguo.modules.sys.service.impl; - -import java.util.Arrays; -import java.util.List; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.baomidou.mybatisplus.plugins.Page; -import com.baomidou.mybatisplus.service.impl.ServiceImpl; -import com.tamguo.modules.sys.dao.SysRoleMapper; -import com.tamguo.modules.sys.model.SysRoleEntity; -import com.tamguo.modules.sys.service.ISysRoleService; - -@Service -public class SysRoleServiceImpl extends ServiceImpl implements ISysRoleService{ - - @Autowired - private SysRoleMapper sysRoleMapper; - - @Override - public List findAll() { - return sysRoleMapper.selectList(null); - } - - @Transactional(readOnly=true) - @Override - public Page queryList(SysRoleEntity sysRoleEntity, Page page) { - List list = sysRoleMapper.selectPageByName(sysRoleEntity , page); - page.setRecords(list); - return page; - } - - @Override - public SysRoleEntity select(String uid) { - return sysRoleMapper.selectById(uid); - } - - @Transactional(readOnly=false) - @Override - public void save(SysRoleEntity role) { - role.setPerms(StringUtils.join(role.getMenuIdList(), ",")); - sysRoleMapper.insert(role); - } - - @Transactional(readOnly=false) - @Override - public void update(SysRoleEntity role) { - role.setPerms(StringUtils.join(role.getMenuIdList(), ",")); - sysRoleMapper.updateById(role); - } - - @Transactional(readOnly=false) - @Override - public void deleteBatch(String[] roleIds) { - sysRoleMapper.deleteBatchIds(Arrays.asList(roleIds)); - } - -} diff --git a/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/impl/SysUserServiceImpl.java b/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/impl/SysUserServiceImpl.java index 0701b6d..55837b6 100644 --- a/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/impl/SysUserServiceImpl.java +++ b/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/impl/SysUserServiceImpl.java @@ -4,7 +4,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.alibaba.druid.util.StringUtils; import com.baomidou.mybatisplus.plugins.Page; import com.tamguo.modules.sys.dao.SysUserMapper; import com.tamguo.modules.sys.model.SysUserEntity; @@ -27,15 +26,6 @@ public class SysUserServiceImpl implements ISysUserService{ @Transactional(readOnly=false) @Override public Page listData(SysUserCondition condition) { - if(!StringUtils.isEmpty(condition.getCompanyCode())) { - condition.setCompanyCode("%" + condition.getCompanyCode() + "%"); - } - if(!StringUtils.isEmpty(condition.getName())) { - condition.setName("%" + condition.getName() + "%"); - } - if(!StringUtils.isEmpty(condition.getNickName())) { - condition.setNickName("%" + condition.getNickName() + "%"); - } Page page = new Page<>(condition.getPageNo() , condition.getPageSize()); return page.setRecords(sysUserMapper.listData(condition , page)); } diff --git a/tamguo-oms/src/main/resources/mappers/SysMenuMapper.xml b/tamguo-oms/src/main/resources/mappers/SysMenuMapper.xml deleted file mode 100644 index 7997aac..0000000 --- a/tamguo-oms/src/main/resources/mappers/SysMenuMapper.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - - id, parent_id, name, url, type, perms , order_num - - - - - - - - - - - \ No newline at end of file diff --git a/tamguo-oms/src/main/resources/mappers/SysOfficeMapper.xml b/tamguo-oms/src/main/resources/mappers/SysOfficeMapper.xml index 78febbe..3a6d5be 100644 --- a/tamguo-oms/src/main/resources/mappers/SysOfficeMapper.xml +++ b/tamguo-oms/src/main/resources/mappers/SysOfficeMapper.xml @@ -4,29 +4,14 @@ SELECT - p.id, - p. NAME, - p.`code`, - p.post_type, - p.sorts, - p.remarks, - p.create_date, - p.update_date, - p.status + p.* FROM sys_post p 1 = 1 - - and p.code = #{code} - - - and p.name like #{name} - - - and p.post_type like #{postType} - - - and p.status like #{status} - diff --git a/tamguo-oms/src/main/resources/mappers/SysRoleMapper.xml b/tamguo-oms/src/main/resources/mappers/SysRoleMapper.xml deleted file mode 100644 index 060934a..0000000 --- a/tamguo-oms/src/main/resources/mappers/SysRoleMapper.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/tamguo-oms/src/main/resources/templates/modules/sys/company/index.html b/tamguo-oms/src/main/resources/templates/modules/sys/company/index.html index 77c8269..4ee697c 100644 --- a/tamguo-oms/src/main/resources/templates/modules/sys/company/index.html +++ b/tamguo-oms/src/main/resources/templates/modules/sys/company/index.html @@ -82,12 +82,12 @@ content="width=device-width, initial-scale=1, user-scalable=1" name="viewport"/> + + + + - \ No newline at end of file +//--> + \ No newline at end of file