瀏覽代碼

阶段提交

laowo 3 年之前
父節點
當前提交
b9b2fa17ba

+ 5 - 0
src/main/java/com/usky/controller/sys/DeptController.java

@@ -7,6 +7,7 @@ import com.usky.service.sys.dept.DeptService;
 import com.usky.service.sys.user.UserService;
 import com.usky.service.sys.user.UserService;
 import com.usky.utils.ListUtil;
 import com.usky.utils.ListUtil;
 import com.usky.utils.Result;
 import com.usky.utils.Result;
+import com.usky.utils.ShiroUtils;
 import com.usky.utils.StringUtils;
 import com.usky.utils.StringUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParam;
@@ -17,6 +18,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
 
 
+import java.sql.Timestamp;
 import java.util.List;
 import java.util.List;
 
 
 /**
 /**
@@ -89,6 +91,9 @@ public class DeptController {
                 && deptService.queryDeptChildByid(dept.getDeptId()) > 0) {
                 && deptService.queryDeptChildByid(dept.getDeptId()) > 0) {
             return Result.error("该部门包含未停用的子部门!");
             return Result.error("该部门包含未停用的子部门!");
         }
         }
+        dept.setUpdateBy(ShiroUtils.getSysUserVo().getLoginName());
+        dept.setUpdateTime(new Timestamp(System.currentTimeMillis()));
+        deptService.updataDeptInfo(dept);
         return Result.OK();
         return Result.OK();
     }
     }
 
 

+ 5 - 5
src/main/java/com/usky/exception/GloableExceptionResolver.java

@@ -192,11 +192,11 @@ public class GloableExceptionResolver {
 //     * @param ex
 //     * @param ex
 //     * @return
 //     * @return
 //     */
 //     */
-//    @ResponseStatus(HttpStatus.INTERNAL_SERVER_ERROR)
-//    @ExceptionHandler(Exception.class)
-//    public Result<?> globalException(HttpServletRequest request, Throwable ex) {
-//        return Result.error(this.getStatus(request).value(), ex.toString() + ": " + ex.getMessage());
-//    }
+    @ResponseStatus(HttpStatus.INTERNAL_SERVER_ERROR)
+    @ExceptionHandler(Exception.class)
+    public Result<?> globalException(HttpServletRequest request, Throwable ex) {
+        return Result.error(this.getStatus(request).value(), ex.toString() + ": " + ex.getMessage());
+    }
 
 
 
 
 }
 }

+ 7 - 0
src/main/java/com/usky/service/sys/dept/DeptService.java

@@ -50,5 +50,12 @@ public interface DeptService {
     List selectDeptCount(Integer deptId);
     List selectDeptCount(Integer deptId);
 
 
     void remove(Integer deptId);
     void remove(Integer deptId);
+
+    /**
+     * 部门信息修改
+     *
+     * @param dept
+     */
+    void updataDeptInfo(SysDeptDTO dept);
 }
 }
 
 

+ 15 - 0
src/main/java/com/usky/service/sys/dept/DeptServiceImpl.java

@@ -5,6 +5,7 @@ import com.usky.dao.impl.BaseDaoImpl;
 import com.usky.entity.sys.SysDeptDTO;
 import com.usky.entity.sys.SysDeptDTO;
 import com.usky.entity.sys.vo.SysDeptVO;
 import com.usky.entity.sys.vo.SysDeptVO;
 import com.usky.entity.ztree.Ztree;
 import com.usky.entity.ztree.Ztree;
+import com.usky.exception.CustomException;
 import com.usky.utils.ListUtil;
 import com.usky.utils.ListUtil;
 import com.usky.utils.Result;
 import com.usky.utils.Result;
 import com.usky.utils.ShiroUtils;
 import com.usky.utils.ShiroUtils;
@@ -57,6 +58,15 @@ public class DeptServiceImpl extends BaseDaoImpl implements DeptService {
     @Override
     @Override
     public Result<?> add(SysDeptDTO dept) {
     public Result<?> add(SysDeptDTO dept) {
         SysDeptDTO parent = queryDeptById(dept.getParentId());
         SysDeptDTO parent = queryDeptById(dept.getParentId());
+
+        if (null == parent) {
+            dept.setAncestors(dept.getParentId().toString());
+            dept.setDelFlag("0");
+            dept.setCreateBy(ShiroUtils.getSysUserVo().getLoginName());
+            dept.setCreateTime(new Timestamp(System.currentTimeMillis()));
+            getSession().save(dept);
+            return Result.OK();
+        }
         if ("1".equals(parent.getStatus())) {
         if ("1".equals(parent.getStatus())) {
             Result.error("部门已停用无法添加!");
             Result.error("部门已停用无法添加!");
         }
         }
@@ -89,6 +99,11 @@ public class DeptServiceImpl extends BaseDaoImpl implements DeptService {
         getSession().createSQLQuery("update sys_dept set del_flag = '1' where dept_id = " + deptId + "");
         getSession().createSQLQuery("update sys_dept set del_flag = '1' where dept_id = " + deptId + "");
     }
     }
 
 
+    @Override
+    public void updataDeptInfo(SysDeptDTO dept) {
+        getSession().update(dept);
+    }
+
 
 
     public SysDeptDTO queryDeptById(Integer deptId) {
     public SysDeptDTO queryDeptById(Integer deptId) {