From ee9389f45ad0c5bb72b5fb878dda1ecf2135154e Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期四, 29 九月 2022 10:52:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
flower_city/src/main/java/com/dg/core/api/OrganizationAppletsController.java | 1 -
flower_city/src/main/java/com/dg/core/controller/ClassifyAdministrationController.java | 1 -
flower_city/src/main/java/com/dg/core/db/gen/mapper/SysUserMapper.java | 7 +++++++
flower_city/src/main/java/com/dg/core/api/TransactionEventAppletsController.java | 3 ---
flower_city/src/main/java/com/dg/core/service/ISysUserService.java | 7 +++++++
flower_city/src/main/java/com/dg/core/api/ClassifyAdministrationAppletsController.java | 1 -
flower_city/src/main/resources/mapper/SysUserMapper.xml | 5 +++++
flower_city/src/main/java/com/dg/core/controller/UserController.java | 12 ++++++++++++
flower_city/src/main/java/com/dg/core/controller/GuideRepairOrderController.java | 1 -
flower_city/src/main/java/com/dg/core/controller/TransactionEventController.java | 2 --
flower_city/src/main/java/com/dg/core/service/impl/SysUserServiceImpl.java | 5 +++++
flower_city/src/main/java/com/dg/core/api/AgreementAppletsController.java | 1 -
flower_city/src/main/java/com/dg/core/controller/OrganizationController.java | 1 -
flower_city/src/main/java/com/dg/core/controller/AgreementController.java | 1 -
14 files changed, 36 insertions(+), 12 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/api/AgreementAppletsController.java b/flower_city/src/main/java/com/dg/core/api/AgreementAppletsController.java
index 771ca6b..61c30f3 100644
--- a/flower_city/src/main/java/com/dg/core/api/AgreementAppletsController.java
+++ b/flower_city/src/main/java/com/dg/core/api/AgreementAppletsController.java
@@ -27,7 +27,6 @@
*/
@ApiOperation(value = "通过协议名获取相关协议",response = Agreement.class)
@GetMapping(value = "/queryByAgreement")
- @Authorization
public ResultData queryByAgreement(@RequestParam("agreement") String agreement) {
return ResultData.success(agreementService.queryByAgreement(agreement));
}
diff --git a/flower_city/src/main/java/com/dg/core/api/ClassifyAdministrationAppletsController.java b/flower_city/src/main/java/com/dg/core/api/ClassifyAdministrationAppletsController.java
index 8fb6be0..2abeba9 100644
--- a/flower_city/src/main/java/com/dg/core/api/ClassifyAdministrationAppletsController.java
+++ b/flower_city/src/main/java/com/dg/core/api/ClassifyAdministrationAppletsController.java
@@ -54,7 +54,6 @@
*/
@ApiOperation("获取分类根据id 如果是二级id则获取的是办事指南,不传参默认是0")
@GetMapping("/queryListById")
- @Authorization
ResultData queryListById(@RequestParam(value = "id",required = false) Integer id){
if(id==null)
id=0;
diff --git a/flower_city/src/main/java/com/dg/core/api/OrganizationAppletsController.java b/flower_city/src/main/java/com/dg/core/api/OrganizationAppletsController.java
index d1d4560..96c36db 100644
--- a/flower_city/src/main/java/com/dg/core/api/OrganizationAppletsController.java
+++ b/flower_city/src/main/java/com/dg/core/api/OrganizationAppletsController.java
@@ -47,7 +47,6 @@
*/
@ApiOperation(value = "根据id查取消组织机构",response = OrganizationChartEntity.class)
@GetMapping("/selectById")
- @Authorization
ResultData selectConfigById(@RequestParam("id") String id){
return ResultData.success(iOrganizationChartService.selectConfigById(id));
}
diff --git a/flower_city/src/main/java/com/dg/core/api/TransactionEventAppletsController.java b/flower_city/src/main/java/com/dg/core/api/TransactionEventAppletsController.java
index 5f6784e..35912db 100644
--- a/flower_city/src/main/java/com/dg/core/api/TransactionEventAppletsController.java
+++ b/flower_city/src/main/java/com/dg/core/api/TransactionEventAppletsController.java
@@ -36,7 +36,6 @@
*/
@ApiOperation("查询导办事务详情")
@GetMapping("/getData")
- @Authorization
public ResultData selectConfigData(@RequestParam("Id") String Id,@CurrentUser SysUser sysUser)
{
Assert.notNull(Id, "Id 不能为空");
@@ -67,7 +66,6 @@
*/
@ApiOperation(value = "导办事务搜索(无分页用于小程序)",response = QueryResults.class)
@GetMapping("/queryKeyWord")
- @Authorization
public QueryResults queryKeyWord(@RequestParam(value = "keyWord",required = false) String keyWord)
{
QueryResults queryResults = iTransactionEventService.queryMatterNameList(keyWord);
@@ -104,7 +102,6 @@
*/
@ApiOperation(value = "智能咨询",response = RecommendResult.class)
@GetMapping("/smartConsulting")
- @Authorization
public RecommendResult smartConsulting(@RequestParam("keyWord") String keyWord){
return iTransactionEventService.smartConsulting(keyWord);
diff --git a/flower_city/src/main/java/com/dg/core/controller/AgreementController.java b/flower_city/src/main/java/com/dg/core/controller/AgreementController.java
index c594da2..c3ae491 100644
--- a/flower_city/src/main/java/com/dg/core/controller/AgreementController.java
+++ b/flower_city/src/main/java/com/dg/core/controller/AgreementController.java
@@ -29,7 +29,6 @@
*/
@ApiOperation(value = "通过协议名获取相关协议",response = Agreement.class)
@GetMapping(value = "/queryByAgreement")
- @Authorization
public ResultData queryByAgreement(@RequestParam("agreement") String agreement) {
return ResultData.success(agreementService.queryByAgreement(agreement));
}
diff --git a/flower_city/src/main/java/com/dg/core/controller/ClassifyAdministrationController.java b/flower_city/src/main/java/com/dg/core/controller/ClassifyAdministrationController.java
index 6ccd07b..db33ec1 100644
--- a/flower_city/src/main/java/com/dg/core/controller/ClassifyAdministrationController.java
+++ b/flower_city/src/main/java/com/dg/core/controller/ClassifyAdministrationController.java
@@ -136,7 +136,6 @@
*/
@ApiOperation("获取分类根据id 如果是二级id则获取的是办事指南,不传参默认是0")
@GetMapping("/queryListById")
- @Authorization
ResultData queryListById(@RequestParam(value = "id",required = false) Integer id){
if(id==null)
id=0;
diff --git a/flower_city/src/main/java/com/dg/core/controller/GuideRepairOrderController.java b/flower_city/src/main/java/com/dg/core/controller/GuideRepairOrderController.java
index 11babb4..6292e36 100644
--- a/flower_city/src/main/java/com/dg/core/controller/GuideRepairOrderController.java
+++ b/flower_city/src/main/java/com/dg/core/controller/GuideRepairOrderController.java
@@ -339,7 +339,6 @@
List<GuideRepairOrder> list = iGuideRepairOrderService.selectConfigList(pageParam,pageSize,matterName);
int num=iGuideRepairOrderService.countConfigList(matterName);
return getDataTable(list,num);
-
}
diff --git a/flower_city/src/main/java/com/dg/core/controller/OrganizationController.java b/flower_city/src/main/java/com/dg/core/controller/OrganizationController.java
index 21480c3..80534dd 100644
--- a/flower_city/src/main/java/com/dg/core/controller/OrganizationController.java
+++ b/flower_city/src/main/java/com/dg/core/controller/OrganizationController.java
@@ -96,7 +96,6 @@
*/
@ApiOperation(value = "根据id查取消组织机构",response = OrganizationChartEntity.class)
@GetMapping("/selectById")
- @Authorization
ResultData selectConfigById(@RequestParam("id") String id){
return ResultData.success(iOrganizationChartService.selectConfigById(id));
}
diff --git a/flower_city/src/main/java/com/dg/core/controller/TransactionEventController.java b/flower_city/src/main/java/com/dg/core/controller/TransactionEventController.java
index af7af91..7c379e1 100644
--- a/flower_city/src/main/java/com/dg/core/controller/TransactionEventController.java
+++ b/flower_city/src/main/java/com/dg/core/controller/TransactionEventController.java
@@ -36,7 +36,6 @@
*/
@ApiOperation("查询导办事务详情")
@GetMapping("/getData")
- @Authorization
public ResultData selectConfigData(@RequestParam("Id") String Id,@CurrentUser SysUser sysUser)
{
Assert.notNull(Id, "Id 不能为空");
@@ -195,7 +194,6 @@
*/
@ApiOperation(value = "智能咨询",response = RecommendResult.class)
@GetMapping("/smartConsulting")
- @Authorization
public RecommendResult smartConsulting(@RequestParam("keyWord") String keyWord){
return iTransactionEventService.smartConsulting(keyWord);
diff --git a/flower_city/src/main/java/com/dg/core/controller/UserController.java b/flower_city/src/main/java/com/dg/core/controller/UserController.java
index 5c0e1c3..7c7ee15 100644
--- a/flower_city/src/main/java/com/dg/core/controller/UserController.java
+++ b/flower_city/src/main/java/com/dg/core/controller/UserController.java
@@ -13,6 +13,7 @@
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.repository.query.Param;
import org.springframework.util.Assert;
import org.springframework.web.bind.annotation.*;
@@ -247,6 +248,17 @@
return toAjax(IUserService.updateConfig(config));
}
+ /**
+ * 根据部门id及分类id获取导办用户
+ *
+ * @return 结果
+ */
+ @ApiOperation("根据部门id及分类id获取导办用户")
+ @GetMapping("/selectListByDepartmentId")
+ public ResultData selectListByDepartmentId(@RequestParam("departmentId") String departmentId, @RequestParam("classifyId") String classifyId){
+ return ResultData.success(IUserService.selectListByDepartmentId(departmentId,classifyId));
+ }
+
}
diff --git a/flower_city/src/main/java/com/dg/core/db/gen/mapper/SysUserMapper.java b/flower_city/src/main/java/com/dg/core/db/gen/mapper/SysUserMapper.java
index 3f2bc60..e246c18 100644
--- a/flower_city/src/main/java/com/dg/core/db/gen/mapper/SysUserMapper.java
+++ b/flower_city/src/main/java/com/dg/core/db/gen/mapper/SysUserMapper.java
@@ -59,4 +59,11 @@
* @return 结果
*/
public int selectNum(String userType);
+
+ /**
+ * 根据部门id及分类id获取导办用户
+ *
+ * @return 结果
+ */
+ List<SysUser> selectListByDepartmentId(@Param("departmentId") String departmentId,@Param("classifyId") String classifyId);
}
diff --git a/flower_city/src/main/java/com/dg/core/service/ISysUserService.java b/flower_city/src/main/java/com/dg/core/service/ISysUserService.java
index 4c38648..31d4795 100644
--- a/flower_city/src/main/java/com/dg/core/service/ISysUserService.java
+++ b/flower_city/src/main/java/com/dg/core/service/ISysUserService.java
@@ -64,5 +64,12 @@
*/
ResultData loginByAccount(String phonenumber, String code);
+ /**
+ * 根据部门id及分类id获取导办用户
+ *
+ * @return 结果
+ */
+ List<SysUser> selectListByDepartmentId(String departmentId,String classifyId);
+
}
diff --git a/flower_city/src/main/java/com/dg/core/service/impl/SysUserServiceImpl.java b/flower_city/src/main/java/com/dg/core/service/impl/SysUserServiceImpl.java
index e9d5229..68ec4a3 100644
--- a/flower_city/src/main/java/com/dg/core/service/impl/SysUserServiceImpl.java
+++ b/flower_city/src/main/java/com/dg/core/service/impl/SysUserServiceImpl.java
@@ -103,6 +103,11 @@
}
@Override
+ public List<SysUser> selectListByDepartmentId(String departmentId, String classifyId) {
+ return baseMapper.selectListByDepartmentId(departmentId,classifyId);
+ }
+
+ @Override
public List<SysUser> selectConfigList(IPage<SysUser> page, Integer state,String userType) {
return baseMapper.selectConfigList(page, state,userType);
}
diff --git a/flower_city/src/main/resources/mapper/SysUserMapper.xml b/flower_city/src/main/resources/mapper/SysUserMapper.xml
index 50e7c7e..cfe6b17 100644
--- a/flower_city/src/main/resources/mapper/SysUserMapper.xml
+++ b/flower_city/src/main/resources/mapper/SysUserMapper.xml
@@ -97,6 +97,11 @@
order by create_time desc
</select>
+ <select id="selectListByDepartmentId" resultMap="SysUserResult">
+ <include refid="selectSysUserVo"/>
+ where department_id=#{departmentId} and master_ids like concat('%',#{classifyId}, '%')
+ </select>
+
<insert id="insertConfig" parameterType="com.dg.core.db.gen.entity.SysUser">
insert into automessage_sys_user (
--
Gitblit v1.7.1