机构级别获取方法改变

src/main/java/com/chinaitop/depot/system/controller/OrgInfoController.java

@@ -157,6 +157,16 @@ public class OrgInfoController {
         		orgInfo.setWjl(hexString);
         	}
 			orgInfoService.add(orgInfo);
+			
+			/*新增机构时，重新配置级别*/
+			orgInfoService.clearOrgLevel(new HashMap<String,Object>());//清空所有级别
+			OrgInfoExample example = new OrgInfoExample();
+			Criteria criteria = example.createCriteria();
+			criteria.andParentIdEqualTo(0);
+			List<OrgInfo> list = orgInfoService.queryByExample(example);//查询最顶级机构
+			orgInfoService.updateOrgLevel(list.get(0));
+			/*新增机构时，重新配置级别*/
+			
 			//默认给新建的机构创建一个系统管理员角色
 			RoleInfo roleInfo = new RoleInfo();
 			roleInfo.setOrgId(orgInfo.getOrgId());
@@ -180,7 +190,7 @@ public class OrgInfoController {
         	}
 			orgInfoService.update(orgInfo);
 		}
-        if(5318 == orgInfo.getOrgClassId()) {//粮食企业的级别是在上级行政单位的级别上加2位顺序码
+        /*if(5318 == orgInfo.getOrgClassId()) {//粮食企业的级别是在上级行政单位的级别上加2位顺序码
         	//查询父机构id以及层级，更新本级机构层级
         	OrgInfo orgParentInfo = orgInfoService.findById(orgInfo.getParentId());
         	Map<String,Object> map = new HashMap<String,Object>();
@@ -188,7 +198,7 @@ public class OrgInfoController {
         	map.put("orgClassId", 5318);
         	orgInfoService.clearOrgLevel(map);
         	orgInfoService.updateOrgLevel(orgParentInfo);
-        }
+        }*/
 		modelMap.put("status", "success");
 		modelMap.put("newOrgId", orgInfo.getOrgId());
 		return modelMap;

src/main/java/com/chinaitop/depot/system/mapper/OrgInfoMapper.xml

@@ -924,7 +924,7 @@
   </update>
   
   <update id="clearOrgLevel" parameterType="map" >
-      update org_info set level_code = '' where parent_id = #{parentId,jdbcType=INTEGER} and org_class_id = #{orgClassId,jdbcType=INTEGER}
+      update org_info set level_code = ''
   </update>
   
   <select id="getAllDepotInfo" resultMap="BaseResultMap" parameterType="map" >

src/main/java/com/chinaitop/depot/system/service/impl/OrgInfoServiceImpl.java

@@ -166,13 +166,8 @@ public class OrgInfoServiceImpl implements OrgInfoService {
 	@Override
 	public void updateOrgLevel(OrgInfo orgInfo) {
 		Map<String,Object> map = new HashMap<String,Object>();
-		if(orgInfo.getParentId() == 0 && (orgInfo.getLevelCode() == null || ("").equals(orgInfo.getLevelCode()))) {//根机构
-			map.put("parentId", orgInfo.getOrgId());
-			map.put("parentLevel", "10");
-		}else {
-			map.put("parentId", orgInfo.getOrgId());
-			map.put("parentLevel", orgInfo.getLevelCode());
-		}
+		map.put("parentId", orgInfo.getOrgId());
+		map.put("parentLevel", "53");
 		OrgInfoMapper.updateOrgLevel(map);
 	}