Selaa lähdekoodia

组织管理中,被用户选择了的部门可以直接删除问题修复

Michael 8 vuotta sitten
vanhempi
commit
a68f30026b

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

@@ -109,4 +109,6 @@ public interface OrganizationManagementMapper {
 	String selectNameById(String id);
 	
 	String selectDepNoById(String id);
+	
+	int selectUserById(String id);
 }

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

@@ -562,4 +562,11 @@
 		where
 		id=#{id,jdbcType=VARCHAR}
 	</select>
+	<select id="selectUserById" parameterType="java.lang.String" resultType="java.lang.Integer">
+		select
+		count(0)
+		from admin
+		where
+		department_id=#{id,jdbcType=VARCHAR}
+	</select>
 </mapper>

+ 5 - 0
src/main/java/com/goafanti/organization/controller/OrganizationManagementController.java

@@ -98,6 +98,11 @@ public class OrganizationManagementController extends BaseApiController{
 			res.getError().add(buildError("","存在下级组织不能删除"));
 			return res;
 		}
+		int adminCount=organizationManagementMapper.selectUserById(id);
+		if(adminCount>0){
+			res.getError().add(buildError("","部门被用户选定不能删除"));
+			return res;
+		}
 		organizationService.deleteById(id);
 		return res;
 	}