diff --git a/jsite-core/src/main/java/com/jsite/modules/sys/dao/OfficeDao.java b/jsite-core/src/main/java/com/jsite/modules/sys/dao/OfficeDao.java index f2bddb9d7aa4291dda967409932c20cc4a249dc4..f7e5a0590643e1524fd7b73149a79d2d1171d8fd 100644 --- a/jsite-core/src/main/java/com/jsite/modules/sys/dao/OfficeDao.java +++ b/jsite-core/src/main/java/com/jsite/modules/sys/dao/OfficeDao.java @@ -8,6 +8,8 @@ import com.jsite.common.persistence.annotation.MyBatisDao; import com.jsite.modules.sys.entity.Office; import org.apache.ibatis.annotations.Param; +import java.util.List; + /** * 机构DAO接口 * @author ThinkGem @@ -16,4 +18,5 @@ import org.apache.ibatis.annotations.Param; @MyBatisDao public interface OfficeDao extends TreeDao { Office getOfficeByName(@Param("officeName")String officeName); + List selectDeptList(Office office); } diff --git a/jsite-core/src/main/java/com/jsite/modules/sys/service/OfficeService.java b/jsite-core/src/main/java/com/jsite/modules/sys/service/OfficeService.java index 189e748ae5fd846464e6126f9ecc79d31e95f6e4..1a523414aaf84885d451fe7edb19f56b40f5f9be 100644 --- a/jsite-core/src/main/java/com/jsite/modules/sys/service/OfficeService.java +++ b/jsite-core/src/main/java/com/jsite/modules/sys/service/OfficeService.java @@ -48,5 +48,8 @@ public class OfficeService extends TreeService { super.delete(office); UserUtils.removeCache(UserUtils.CACHE_OFFICE_LIST); } - + + public List selectDeptList(Office office) { + return dao.selectDeptList(office); + } } diff --git a/jsite-core/src/main/java/com/jsite/modules/sys/web/OfficeController.java b/jsite-core/src/main/java/com/jsite/modules/sys/web/OfficeController.java index 81f265b4621d21a169103b734769ce7e37b10ffa..0743ed20b2e8cab3c0b0e05bef25961c374f1f98 100644 --- a/jsite-core/src/main/java/com/jsite/modules/sys/web/OfficeController.java +++ b/jsite-core/src/main/java/com/jsite/modules/sys/web/OfficeController.java @@ -53,6 +53,19 @@ public class OfficeController extends BaseController { return officeService.findList(office); } + /** + * 部门下拉菜单条件查询部门列表 + * @param office + * @param model + * @return + */ + @RequiresPermissions("sys:office:view") + @RequestMapping(value = "selectDeptList") + @ResponseBody + public List selectDeptList(Office office, Model model) { + return officeService.selectDeptList(office); + } + @RequiresPermissions("sys:office:view") @RequestMapping(value = {"list", ""}) public String list() { diff --git a/jsite-core/src/main/resources/mappings/modules/sys/OfficeDao.xml b/jsite-core/src/main/resources/mappings/modules/sys/OfficeDao.xml index 8a674f4c962b43d7769eb2c5d412fbd821b95b6a..429832266ec4414b5a945584c752165724f44fc9 100644 --- a/jsite-core/src/main/resources/mappings/modules/sys/OfficeDao.xml +++ b/jsite-core/src/main/resources/mappings/modules/sys/OfficeDao.xml @@ -203,5 +203,16 @@ '%,'+#{id}+',%' CONCAT('%,', #{id}, ',%') + + \ No newline at end of file