mula
/
fourcal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修复后台管理问题

master
hanbo 2021-12-08 15:02:05 +08:00
parent f0706eaeb4
commit 1c4f946df8
6 changed files with 52 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/cn/palmte/work/controller/backend/SysPermissionController.java
View File

@ -7,6 +7,7 @@ import cn.palmte.work.model.SysPermissionRepository;
import cn.palmte.work.service.SysPermissionService;
import cn.palmte.work.service.SysRolePermissionService;
import cn.palmte.work.utils.DateKit;
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@ -74,13 +75,20 @@ public class SysPermissionController extends BaseController{
@PostMapping(value = "/save")
public String save(@RequestParam("permissionID") String permissionID,
SysPermission sysPermission, RedirectAttributes attr) throws IOException{
SysPermission sysPermission, RedirectAttributes attr, Map<String, Object> model) throws IOException{
final SysPermission parent = sysPermissionRepository.findOne(sysPermission.getParentId());
sysPermission.setLevel(parent.getLevel()+1);
int type = (parent.getLevel()==4) ? 2 : 1;
sysPermission.setType(type);
String message = sysPermissionService.check(sysPermission,permissionID);
if (StringUtils.isNotEmpty(message)) {
model.put("errorMessage", message);
return "/common/error";
}
if ("-1".equals(permissionID)){
getSql(sysPermission, attr, parent);
sysPermissionService.addPermission(sysPermission); //新增

4
src/main/java/cn/palmte/work/model/SysPermissionRepository.java
View File

@ -31,4 +31,8 @@ public interface SysPermissionRepository extends JpaRepository<SysPermission, I
@Query(" from SysPermission sp where sp.isDeleted=0 AND sp.level<5 order by id asc")
List<SysPermission> findPermissions();
SysPermission findByUrlEquals(String url);
SysPermission findByPermissionEquals(String permission);
}

2
src/main/java/cn/palmte/work/model/SysPermissionRepositoryImpl.java
View File

@ -96,7 +96,7 @@ public class SysPermissionRepositoryImpl implements SysPermissionRepositoryCusto
public String getSqlExceptSelect(ConcurrentHashMap<String, String> searchInfo){
// StringBuffer sqlExceptSelect=new StringBuffer(" from sys_permission p where 1=1 and is_deleted= 0 ");
StringBuffer sqlExceptSelect=new StringBuffer(" from sys_permission p where 1=1 ");
StringBuffer sqlExceptSelect=new StringBuffer(" from sys_permission p where 1=1 and p.is_deleted = 0 ");
for(Map.Entry<String, String> item : searchInfo.entrySet()){
sqlExceptSelect.append(buildQuery(item));
}

2
src/main/java/cn/palmte/work/service/AccountService.java
View File

@ -66,7 +66,7 @@ public class AccountService {
queryHelper.addCondition(searchInfo.containsKey("realName"), "u.real_name like ?", "%" +
searchInfo.get("realName") + "%");
queryHelper.addCondition(searchInfo.containsKey("telephone"), "u.telephone =?", searchInfo.get("telephone"));
queryHelper.addCondition(searchInfo.containsKey("empCode"), "u.emp_code =?", searchInfo.get("empCode"));
queryHelper.addCondition(searchInfo.containsKey("userName"), "u.user_name =?", searchInfo.get("userName"));
queryHelper.addCondition(searchInfo.containsKey("deptId") &&
StrKit.notBlank(searchInfo.get("deptId")) && !"-1".equals(searchInfo.get("deptId")),
"u.dept_id =?", searchInfo.get("deptId"));

31
src/main/java/cn/palmte/work/service/SysPermissionService.java
View File

@ -123,4 +123,35 @@ public class SysPermissionService {
}
public String check(SysPermission sysPermission, String permissionID) {
SysPermission byUrlEquals = sysPermissionRepository.findByUrlEquals(sysPermission.getUrl());
String message = "";
if ("-1".equals(permissionID)) {
if (null != byUrlEquals) {
message = "该URL已存在！";
return message;
}
} else {
if (null != byUrlEquals && byUrlEquals.getId() != Integer.parseInt(permissionID)) {
message = "该URL已存在！";
return message;
}
}
SysPermission byPermissionEquals = sysPermissionRepository.findByPermissionEquals(sysPermission.getPermission());
if ("-1".equals(permissionID)) {
if (null != byPermissionEquals) {
message = "该权限编码已存在！";
return message;
}
} else {
if (null != byPermissionEquals && byPermissionEquals.getId() != Integer.parseInt(permissionID)) {
message = "该权限编码已存在！";
return message;
}
}
return message;
}
}

12
src/main/resources/templates/admin/account_list.ftl
View File

@ -33,8 +33,8 @@
<th class="am-text-middle">工号</th>
<td>
<div class="am-u-sm-10">
<input type="text" id="empCode" class="am-form-field am-input-sm" maxlength="20"
value="${empCode!}"/>
<input type="text" id="userName" class="am-form-field am-input-sm" maxlength="20"
value="${userName!}"/>
</div>
</td>
</tr>
@ -264,8 +264,8 @@
keywordsObj.realName = $("#realName").val();
if ($("#telephone").val())
keywordsObj.telephone = $("#telephone").val();
if ($("#empCode").val())
keywordsObj.empCode = $("#empCode").val();
if ($("#userName").val())
keywordsObj.userName = $("#userName").val();
if ($("#deptId").val())
keywordsObj.deptId = $("#deptId").val();
if ($("#roleId").val())
@ -334,8 +334,8 @@
keywordsObj.realName = $("#realName").val();
if ($("#telephone").val())
keywordsObj.telephone = $("#telephone").val();
if ($("#empCode").val())
keywordsObj.empCode = $("#empCode").val();
if ($("#userName").val())
keywordsObj.userName = $("#userName").val();
if ($("#deptId").val())
keywordsObj.deptId = $("#deptId").val();
if ($("#roleId").val())