Browse Source

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

Administrator 7 years ago
parent
commit
795909f735

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

@@ -546,7 +546,7 @@
 		remarks,status
   		from department_management 		
   		where
-  		id=#{superId,jdbcType=VARCHAR}
+  		super_id=#{id,jdbcType=VARCHAR}
   		order by dep_no
   	</select>
   	<update id="updateByNumber" parameterType="com.goafanti.organization.bo.OrganizationListOut">

+ 3 - 3
src/main/java/com/goafanti/organization/controller/AdminOrganizationController.java

@@ -16,7 +16,7 @@ import com.goafanti.organization.bo.OrganizationListOut;
 import com.goafanti.organization.service.OrganizationService;
 
 @RestController
-@RequestMapping("api/admin/organization")
+@RequestMapping("/api/admin/organization")
 public class AdminOrganizationController extends BaseApiController{
 	@Resource
 	private OrganizationService organizationService;
@@ -107,10 +107,10 @@ public class AdminOrganizationController extends BaseApiController{
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR,""));
 			return res;
 		}		
-		String sdepNo=organizationManagementMapper.selectDepNo(superId);
+		String sdepNo=organizationManagementMapper.selectDepNo(superId);//No
 	/*	String sdepNo=organizationManagementMapper.selectDepNoByName(superId);*/
      /*superId=organizationManagementMapper.selectIdByName(superId);*/
-		int Count=organizationManagementMapper.selectDepNoCount(superId);
+		int Count=organizationManagementMapper.selectDepNoCount(superId);//14
 		if((Count+1)>99){
 			res.getError().add(buildError("","每层最多存在99个子类"));
 			return res;

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

@@ -100,18 +100,18 @@ public class OrganizationServiceImpl extends BaseMybatisDao<OrganizationManageme
 		Date now=new Date();
 		OrganizationManagement om=new OrganizationManagement();
 		om.setName(name);
-		om.setType(type);
+		om.setType(type);  
 		om.setUpdateTime(now);
 		om.setManagerId(managerId);
 		om.setDepNo(depn);
 		om.setSuperId(superId);
 		om.setStatus(status);
-		om.setRemarks(remarks);
+		om.setRemarks(remarks); 
 		om.setId(id);
 		organizationManagementMapper.updateByPrimaryKeySelective(om);
 		//*******下级编号修改
 		int n=0;
-		List<OrganizationListOut> Nos =organizationManagementMapper.selectIDNBySuperId(superId);
+		List<OrganizationListOut> Nos =organizationManagementMapper.selectIDNBySuperId(om.getId());
 		for(OrganizationListOut i:Nos){			
 			String sdepNo=organizationManagementMapper.selectDepNoById(i.getSuperId());
 			if(n<10){
@@ -128,12 +128,12 @@ public class OrganizationServiceImpl extends BaseMybatisDao<OrganizationManageme
 				dep=sdepNo+n;	
 				i.setDepNo(dep);
 			}
-			organizationManagementMapper.updateByNumber(i);
+		organizationManagementMapper.updateByNumber(i);
 			n++;
 			
 			//*******下下级编号修改
 			int m=0;
-			List<OrganizationListOut> Noss =organizationManagementMapper.selectIDNBySuperId(superId);
+			List<OrganizationListOut> Noss =organizationManagementMapper.selectIDNBySuperId(i.getId());
 			//System.out.println("noss="+Noss);
 			for(OrganizationListOut o:Noss){			
 				sdepNo=organizationManagementMapper.selectDepNoById(o.getSuperId());
@@ -156,7 +156,7 @@ public class OrganizationServiceImpl extends BaseMybatisDao<OrganizationManageme
 				
 				//*******下下级编号修改
 				int z=0;
-				List<OrganizationListOut> Nosss =organizationManagementMapper.selectIDNBySuperId(superId);
+				List<OrganizationListOut> Nosss =organizationManagementMapper.selectIDNBySuperId(o.getId());
 				for(OrganizationListOut p:Nosss){			
 					sdepNo=organizationManagementMapper.selectDepNoById(p.getSuperId());
 					if(z<10){