Browse Source

部门新增字段显示标识

anderx 3 years ago
parent
commit
61bbcc68f2

+ 2 - 1
src/main/java/com/goafanti/common/mapper/DepartmentMapper.xml

@@ -397,7 +397,8 @@
   <update id="updateByNumber" parameterType="com.goafanti.organization.bo.OrganizationListOut">
     update department
     <set>
-      dep_no = #{depNo,jdbcType=VARCHAR}
+      dep_no = #{depNo,jdbcType=VARCHAR},
+        lvl= #{lvl}
     </set>
     where
     id=#{id,jdbcType=VARCHAR}

+ 15 - 10
src/main/java/com/goafanti/organization/service/impl/OrganizationServiceImpl.java

@@ -105,7 +105,8 @@ public class OrganizationServiceImpl extends BaseMybatisDao<DepartmentMapper> im
 			depNo= sdepNo +"01";
 		}else {
 			String maxDepNo=maxDep.getDepNo();
-			Integer countNo=Integer.valueOf(maxDepNo.substring(maxDepNo.length()-3));
+			Integer countNo=Integer.valueOf(maxDepNo.substring(maxDepNo.length()-2));
+			countNo++;
 			if (countNo<10){
 				depNo= sdepNo +"0"+countNo;
 			}else {
@@ -137,21 +138,25 @@ public class OrganizationServiceImpl extends BaseMybatisDao<DepartmentMapper> im
 			String remarks,String id,String abbreviation,String financeId,Integer workingHoursType,Integer hideSign) {
 		//获取上级编号
 		Department superDep=departmentMapper.selectByPrimaryKey(superId);
-		String deps ="";
-		if(!name.equals("平台超管中心")){
-			getMaxDep(superDep);
-		}else {
-			deps="DP";
-		}
+		Department use =departmentMapper.selectByPrimaryKey(id);
 		Date now=new Date();
 		Department dep=new Department();
+		String deps ="";
+		if (!use.getSuperId().equals(superId)){
+			if(!name.equals("平台超管中心")){
+				deps=getMaxDep(superDep);
+			}else {
+				deps="DP";
+			}
+			dep.setDepNo(deps);
+			dep.setLvl(superDep.getLvl()+1);
+			dep.setSuperId(superId);
+		}
+
 		dep.setName(name);
 		dep.setType(type);
 		dep.setUpdateTime(now);
 		dep.setManagerId(managerId);
-		dep.setDepNo(deps);
-		dep.setSuperId(superId);
-		dep.setLvl(superDep.getLvl()+1);
 		dep.setStatus(status);
 		dep.setRemarks(remarks);
 		dep.setId(id);