Browse Source

chore: compose workflow api

master
wangxiang 2 years ago
parent
commit
447b572ecd
No known key found for this signature in database
GPG Key ID: 1BA7946AB6B232E4
  1. 6
      kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/RoleController.java
  2. 6
      kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/UserController.java
  3. 5
      kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/UserService.java
  4. 5
      kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/UserServiceImpl.java
  5. 6
      kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/UserMapper.xml

6
kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/RoleController.java

@ -67,6 +67,12 @@ public class RoleController {
return R.ok(role); return R.ok(role);
} }
@GetMapping("/getByIds/{ids:[\\w,]+}")
public R getByIds(@PathVariable String[] ids) {
List<Role> roles = roleService.listByIds(Arrays.asList(ids));
return R.ok(roles);
}
@SysLog("角色新增") @SysLog("角色新增")
@PostMapping("/save") @PostMapping("/save")
@PreAuthorize("@pms.hasPermission('role_add')") @PreAuthorize("@pms.hasPermission('role_add')")

6
kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/UserController.java

@ -101,6 +101,12 @@ public class UserController {
return R.ok(new ResultVo().setResult(user).setExtend(roleList)); return R.ok(new ResultVo().setResult(user).setExtend(roleList));
} }
@GetMapping("/getByIds/{ids}")
public R getByIds(@PathVariable String[] ids) {
List<KiccUser> users = userService.getUserByIds(Arrays.asList(ids));
return R.ok(users);
}
@Inner @Inner
@GetMapping("/getUser/{id:\\w+}") @GetMapping("/getUser/{id:\\w+}")
public R getUser(@PathVariable("id") String id) { public R getUser(@PathVariable("id") String id) {

5
kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/UserService.java

@ -73,6 +73,11 @@ public interface UserService extends IService<User> {
*/ */
KiccUser getUserById(String userId); KiccUser getUserById(String userId);
/**
* 根据多个id查询多个用户
* @param userIds 多个用户ID
*/
List<KiccUser> getUserByIds(List<String> userIds);
/** /**
* 根据casUserId查询用户 * 根据casUserId查询用户

5
kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/UserServiceImpl.java

@ -211,6 +211,11 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
return baseMapper.getUserByParam(MapUtil.<String, Object>builder("id", userId).build()); return baseMapper.getUserByParam(MapUtil.<String, Object>builder("id", userId).build());
} }
@Override
public List<KiccUser> getUserByIds(List<String> userIds) {
return baseMapper.getUserByParamList(MapUtil.<String, Object>builder("ids", userIds).build());
}
@Override @Override
public KiccUser getUserByCasUserId(String casUserId) { public KiccUser getUserByCasUserId(String casUserId) {
return baseMapper.getUserByParam(MapUtil.<String, Object>builder("casUserId", casUserId).build()); return baseMapper.getUserByParam(MapUtil.<String, Object>builder("casUserId", casUserId).build());

6
kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/UserMapper.xml

@ -71,6 +71,12 @@
<if test="phone != null and phone != ''"> <if test="phone != null and phone != ''">
and phone = #{phone} and phone = #{phone}
</if> </if>
<if test="ids != null and ids != ''">
and id in
<foreach collection="ids" item="item" open="(" close=") "
index="index" separator=",">#{item}
</foreach>
</if>
</where> </where>
order by create_time asc order by create_time asc
</select> </select>

Loading…
Cancel
Save