Просмотр исходного кода

Merge remote-tracking branch 'origin/test' into patch

anderx лет назад: 7
Родитель
Сommit
be9688df7f

+ 8 - 11
src/main/java/com/goafanti/organization/service/impl/OrganizationServiceImpl.java

@@ -42,7 +42,7 @@ public class OrganizationServiceImpl extends BaseMybatisDao<OrganizationManageme
 		if(StringUtils.isNotBlank(olo.getType())) params.put("type", olo.getType());
 		if(StringUtils.isNotBlank(olo.getManagerId())) params.put("managerId", olo.getManagerId());
 		if(StringUtils.isNotBlank(olo.getDepNo())) params.put("depNo", olo.getDepNo());
-		if(StringUtils.isNotBlank(olo.getSuperId())) params.put("superId", organizationManagementMapper.selectIdByName(olo.getSuperId()));
+		if(StringUtils.isNotBlank(olo.getSuperId())) params.put("superId", olo.getSuperId());
 		if(StringUtils.isNotBlank(olo.getRemarks())) params.put("remarks", olo.getRemarks());
 		if(StringUtils.isNotBlank(olo.getStatus())) params.put("status", olo.getStatus());
 		return params;
@@ -96,8 +96,7 @@ public class OrganizationServiceImpl extends BaseMybatisDao<OrganizationManageme
 		return 1;
 	}
 	@Override
-	public int updateOrganization(String name, String type, String managerId, String superId, String status,
-			String remarks,String id,String depn) {
+	public int updateOrganization(String name, String type, String managerId, String superId, String status,String remarks,String id,String depn) {
 		Date now=new Date();
 		OrganizationManagement om=new OrganizationManagement();
 		om.setName(name);
@@ -112,10 +111,9 @@ public class OrganizationServiceImpl extends BaseMybatisDao<OrganizationManageme
 		organizationManagementMapper.updateByPrimaryKeySelective(om);
 		//*******下级编号修改
 		int n=0;
-		List<OrganizationListOut> Nos =organizationManagementMapper.selectIDNBySuperId(id);
+		List<OrganizationListOut> Nos =organizationManagementMapper.selectIDNBySuperId(superId);
 		for(OrganizationListOut i:Nos){			
-	//		String sdepNo=organizationManagementMapper.selectDepNoById(i.getSuperId());
-			String sdepNo=organizationManagementMapper.selectDepNo(i.getSuperId());
+			String sdepNo=organizationManagementMapper.selectDepNoById(i.getSuperId());
 			if(n<10){
 				String dep=sdepNo+"0"+n;			
 				if(n>=10){
@@ -135,10 +133,10 @@ public class OrganizationServiceImpl extends BaseMybatisDao<OrganizationManageme
 			
 			//*******下下级编号修改
 			int m=0;
-			List<OrganizationListOut> Noss =organizationManagementMapper.selectIDNBySuperId(i.getId());
-			System.out.println("noss="+Noss);
+			List<OrganizationListOut> Noss =organizationManagementMapper.selectIDNBySuperId(superId);
+			//System.out.println("noss="+Noss);
 			for(OrganizationListOut o:Noss){			
-				sdepNo=organizationManagementMapper.selectDepNo(o.getSuperId());
+				sdepNo=organizationManagementMapper.selectDepNoById(o.getSuperId());
 				if(m<10){
 					String dep=sdepNo+"0"+m;			
 					if(m>=10){
@@ -158,7 +156,7 @@ public class OrganizationServiceImpl extends BaseMybatisDao<OrganizationManageme
 				
 				//*******下下级编号修改
 				int z=0;
-				List<OrganizationListOut> Nosss =organizationManagementMapper.selectIDNBySuperId(o.getId());
+				List<OrganizationListOut> Nosss =organizationManagementMapper.selectIDNBySuperId(superId);
 				for(OrganizationListOut p:Nosss){			
 					sdepNo=organizationManagementMapper.selectDepNoById(p.getSuperId());
 					if(z<10){
@@ -177,7 +175,6 @@ public class OrganizationServiceImpl extends BaseMybatisDao<OrganizationManageme
 					}
 					organizationManagementMapper.updateByNumber(p);
 					z++;
-					
 				}
 			}
 		}