suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
zhangchenbiao
2023-06-06 09:43:31 +08:00
parent 04e7ebea85
commit 7a78f59ad7
108 changed files with 511 additions and 4582 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
coolstore-partner-webb/src/main/java/com/cool/store/controller/EnterpriseUserController.java
View File

@@ -29,8 +29,7 @@ public class EnterpriseUserController {
public EnterpriseUserService enterpriseUserService;
@GetMapping(path = "/dept/userList")
public ResponseResult<PageInfo<EnterpriseUserPageVO>> getUserList(@PathVariable(value = "enterpriseId", required = true) String eid,
@RequestParam(name = "user_name", required = false) String userName,
public ResponseResult<PageInfo<EnterpriseUserPageVO>> getUserList(@RequestParam(name = "user_name", required = false) String userName,
@RequestParam(name = "dept_id", required = false) String deptId,
@RequestParam(name = "role_id", required = false) Long roleId,
@RequestParam(name = "order_by", required = false) String orderBy,
@@ -42,7 +41,7 @@ public class EnterpriseUserController {
@RequestParam(name = "region_id", required = false) String regionId,
@RequestParam(name = "has_page", required = false,defaultValue = "true") Boolean hasPage) {
DataSourceHelper.changeToMy();
List<EnterpriseUserPageVO> deptUserList = enterpriseUserService.listUser(eid, userName, deptId, orderBy, orderRule, roleId, userStatus, pageNum, pageSize, jobNumber,regionId,hasPage);
List<EnterpriseUserPageVO> deptUserList = enterpriseUserService.listUser(userName, deptId, orderBy, orderRule, roleId, userStatus, pageNum, pageSize, jobNumber,regionId,hasPage);
if(CollectionUtils.isNotEmpty(deptUserList)){
return ResponseResult.success(new PageInfo<>(deptUserList));
}else {

7
coolstore-partner-webb/src/main/java/com/cool/store/controller/TestController.java
View File

@@ -25,16 +25,9 @@ import javax.annotation.Resource;
@RequestMapping("test/")
public class TestController {
@Resource
private EnterpriseConfigService enterpriseConfigService;
@Resource
private SimpleMessageService simpleMessageService;
@GetMapping("/selectByEnterpriseId")
public EnterpriseConfigDO selectByEnterpriseId(@RequestParam("enterpriseId") String enterpriseId){
return enterpriseConfigService.selectByEnterpriseId(enterpriseId);
}
@GetMapping("/sendMq")
public ResponseResult sendMq(){
String msg = UUIDUtils.get8UUID();