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

系统模块中,上级组织bug修复

Administrator лет назад: 7
Родитель
Сommit
c4f4a37918

+ 8 - 0
src/main/java/com/goafanti/common/dao/OrganizationManagementMapper.java

@@ -72,6 +72,14 @@ public interface OrganizationManagementMapper {
 	 * 根据组织名称查组织编号
 	 */
 	String selectDepNoByName(String name);
+	
+	/**
+	 * 根据上级组织查组织编号
+	 */
+	String  selectDepNo(String id);
+	/**
+	
+	
 	/**
 	 * 查询相同上级下编号数量
 	 */

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

@@ -467,6 +467,15 @@
 		#{depNo,jdbcType=VARCHAR},#{superId,jdbcType=VARCHAR},
 		#{desc,jdbcType=VARCHAR},#{status,jdbcType=VARCHAR})	
 	</insert>
+	<!-- 得到上级 -->
+	<select id="selectDepNo" resultType="String">
+	select
+	dep_no as depNo
+		from department_management
+		where
+		id=#{superId,jdbcType=VARCHAR}
+	</select>
+	
 	<select id="selectDepNoByName" resultType="String">
 		select
 		dep_no as depNo
@@ -537,7 +546,7 @@
 		remarks,status
   		from department_management 		
   		where
-  		super_id=#{superId,jdbcType=VARCHAR}
+  		id=#{superId,jdbcType=VARCHAR}
   		order by dep_no
   	</select>
   	<update id="updateByNumber" parameterType="com.goafanti.organization.bo.OrganizationListOut">

+ 6 - 6
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("open/api/admin/organization")
 public class AdminOrganizationController extends BaseApiController{
 	@Resource
 	private OrganizationService organizationService;
@@ -41,8 +41,7 @@ public class AdminOrganizationController extends BaseApiController{
 	@RequestMapping(value = "/addOrganization" , method = RequestMethod.POST)
 	public Result addOrganization(String name, String managerId, String type, String superId, String remarks) throws Exception{
 		Result res = new Result();
-		if(StringUtils.isBlank(name) || StringUtils.isBlank(type) 
-				|| StringUtils.isBlank(superId)){
+		if(StringUtils.isBlank(name) || StringUtils.isBlank(type) || StringUtils.isBlank(superId)){
 			res.getError().add(buildError("","组织名称、组织类型、上级组织不能为空"));
 			return res;
 		}
@@ -51,7 +50,7 @@ public class AdminOrganizationController extends BaseApiController{
 			res.getError().add(buildError("","部门已存在"));
 			return res;
 		}		
-		String sdepNo=organizationManagementMapper.selectDepNoByName(superId);
+		String sdepNo=organizationManagementMapper.selectDepNo(superId);
 		int Count=organizationManagementMapper.selectDepNoCount(superId);
 		if((Count+1)>99){
 			res.getError().add(buildError("","每层最多存在99个子类"));
@@ -108,8 +107,9 @@ public class AdminOrganizationController extends BaseApiController{
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR,""));
 			return res;
 		}		
-		String sdepNo=organizationManagementMapper.selectDepNoByName(superId);
-		superId=organizationManagementMapper.selectIdByName(superId);
+		String sdepNo=organizationManagementMapper.selectDepNo(superId);
+	/*	String sdepNo=organizationManagementMapper.selectDepNoByName(superId);*/
+     /*superId=organizationManagementMapper.selectIdByName(superId);*/
 		int Count=organizationManagementMapper.selectDepNoCount(superId);
 		if((Count+1)>99){
 			res.getError().add(buildError("","每层最多存在99个子类"));

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

@@ -58,7 +58,7 @@ public class OrganizationServiceImpl extends BaseMybatisDao<OrganizationManageme
 	 *
 	 */
 	@Override
-	public int addOrganization(String name, String managerId, String type, String superId, String remarks,String dep) {
+	public int addOrganization( String name, String managerId, String type, String superId, String remarks,String dep) {
 		String id = UUID.randomUUID().toString();
 		Date now = new Date();
 		OrganizationManagement om=new OrganizationManagement(); 
@@ -72,7 +72,7 @@ public class OrganizationServiceImpl extends BaseMybatisDao<OrganizationManageme
 		om.setType(type);
 		om.setManagerId(managerId);
 		om.setDepNo(dep);
-		superId=organizationManagementMapper.selectIdByName(superId);
+	//	superId=organizationManagementMapper.selectIdByName(superId);
 		om.setSuperId(superId);
 		om.setRemarks(remarks);
 		om.setStatus("0");
@@ -114,7 +114,8 @@ public class OrganizationServiceImpl extends BaseMybatisDao<OrganizationManageme
 		int n=0;
 		List<OrganizationListOut> Nos =organizationManagementMapper.selectIDNBySuperId(id);
 		for(OrganizationListOut i:Nos){			
-			String sdepNo=organizationManagementMapper.selectDepNoById(i.getSuperId());
+	//		String sdepNo=organizationManagementMapper.selectDepNoById(i.getSuperId());
+			String sdepNo=organizationManagementMapper.selectDepNo(i.getSuperId());
 			if(n<10){
 				String dep=sdepNo+"0"+n;			
 				if(n>=10){
@@ -137,7 +138,7 @@ public class OrganizationServiceImpl extends BaseMybatisDao<OrganizationManageme
 			List<OrganizationListOut> Noss =organizationManagementMapper.selectIDNBySuperId(i.getId());
 			System.out.println("noss="+Noss);
 			for(OrganizationListOut o:Noss){			
-				sdepNo=organizationManagementMapper.selectDepNoById(o.getSuperId());
+				sdepNo=organizationManagementMapper.selectDepNo(o.getSuperId());
 				if(m<10){
 					String dep=sdepNo+"0"+m;			
 					if(m>=10){