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

Merge branch 'test' of jishutao/kede-server into prod

liliang4869 лет назад: 7
Родитель
Сommit
7f23761aea

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

@@ -67,7 +67,7 @@ public interface OrganizationManagementMapper {
 	 * @mbg.generated  Thu Nov 30 11:09:29 CST 2017
 	 */
 	int updateByPrimaryKey(OrganizationManagement record);
-	List<OrganizationListOut> selectSuperId();
+	List<OrganizationListOut> selectSuperId(@Param("sort")int sort);
 	/**
 	 * 根据组织名称查组织编号
 	 */

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

@@ -449,12 +449,15 @@
 			AND om.dep_no=#{depNo,jdbcType=VARCHAR}
 		</if>	
 	</select>
-	<select id="selectSuperId" resultType="com.goafanti.organization.bo.OrganizationListOut">
+	<select id="selectSuperId"  resultType="com.goafanti.organization.bo.OrganizationListOut">
 		select
 		id,name,dep_no as depNo
 		from department
 		where
 		status ='0'
+		<if test="sort ==1" >
+		limit 10	
+		</if>
 	</select>
 	<insert id="insert1" parameterType="com.goafanti.organization.bo.OrganizationListOut">
 		insert into department(

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

@@ -31,10 +31,18 @@ public class AdminOrganizationController extends BaseApiController{
 		return res;		
 	}
 	/**部门组织管理上级组织查询 **/
-	@RequestMapping(value = "/selectSuperId" , method = RequestMethod.POST)
+	@RequestMapping(value = "/selectSuperId" , method = RequestMethod.GET)
 	public Result selectsuperId(){
 		Result res = new Result();
-		res.setData(organizationService.selectSuperId());
+		res.setData(organizationService.selectSuperId(0));
+		return res;
+	}
+	/**部门组织管理上级组织查询 **/
+	@RequestMapping(value = "/selectSuperIdS" , method = RequestMethod.GET)
+	public Result selectsuperIdS(){
+		Result res = new Result();
+		
+		res.setData(organizationService.selectSuperId(1));
 		return res;
 	}
 	/**部门组织管理新增**/

+ 1 - 1
src/main/java/com/goafanti/organization/service/OrganizationService.java

@@ -17,7 +17,7 @@ public interface OrganizationService {
 	Pagination<OrganizationListOut> 
 	listOrganizationManagement(OrganizationListOut olo,Integer pageNo, Integer pageSize);
 	/**组织名称查上级组织*/
-	List<OrganizationListOut> selectSuperId();
+	List<OrganizationListOut> selectSuperId(Integer i);
 	/**
 	 * 
 	 * @param name 组织名称

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

@@ -48,8 +48,8 @@ public class OrganizationServiceImpl extends BaseMybatisDao<OrganizationManageme
 		return params;
 	}
 	@Override
-	public List<OrganizationListOut> selectSuperId() {
-		return organizationManagementMapper.selectSuperId();
+	public List<OrganizationListOut> selectSuperId(Integer i) {
+		return organizationManagementMapper.selectSuperId(i);
 	}
 	/**
 	 *   XXIn form 提交 ,bo包中

+ 4 - 4
src/main/resources/props/config_test.properties

@@ -54,10 +54,10 @@ session.validate.timespan=18000000
 app.name=AFT
 template.cacheable=false
 
-static.host=//static.jishutao.com/1.0.50
-portal.host=//static.jishutao.com/portal/2.0.6
-avatar.host=//static.jishutao.com
-avatar.upload.host=//static.jishutao.com/upload
+static.host=//static.kedexinxi.com/1.0.50
+portal.host=//static.kedexinxi.com/portal/2.0.6
+avatar.host=//static.kedexinxi.com
+avatar.upload.host=//static.kedexinxi.com/upload
 
 upload.path=/data/static/public/upload
 upload.private.path=/data/static/private/upload