Merge branch 'developer' into 'master'

fix

See merge request haoban3.0/haoban-manage3.0!52

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/DepartmentContoller.java

@@ -250,6 +250,9 @@ public class DepartmentContoller extends WebBaseController{
 		if(dto == null || dto.getStatusFlag() == 0) {
 			return resultResponse(HaoBanErrCode.ERR_10003);
 		}
+		if(dto.getTempFlag() != null && dto.getTempFlag() == 1){
+			return resultResponse(HaoBanErrCode.ERR_100015);
+		}
 		ServiceResponse hr;
 		if(StringUtils.isBlank(dto.getRelatedId())) {
 			hr = departmentApiService.del(departmentId);

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/errCode/HaoBanErrCode.java

@@ -86,6 +86,8 @@ public enum HaoBanErrCode {
     ERR_10013(10013,"secret设置失败，请确认"),
     
     ERR_10014(10014,"暂存部门人员不能删除"),
+    
+    ERR_100015(100015,"暂存部门不能删除"),
 
     ERR_DEFINE(-888, "自定义错误"),
     ERR_OTHER(-999, "未知错误code");