团队管理编辑bug修复

common/common-entity/src/main/java/com/yihu/jw/entity/base/team/BaseTeamMemberDO.java

@@ -1,5 +1,6 @@
package com.yihu.jw.entity.base.team;
import com.yihu.jw.entity.IntegerIdentityEntityWithOperator;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -15,7 +16,7 @@ import java.util.Date;
*/
@Entity
@Table(name = "base_team_member")
public class BaseTeamMemberDO extends UuidIdentityEntityWithOperator {
public class BaseTeamMemberDO extends IntegerIdentityEntityWithOperator {
    /**
	* 团队ID

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/base/team/BaseTeamMemberVO.java

@@ -1,5 +1,6 @@
package com.yihu.jw.restmodel.base.team;
import com.yihu.jw.entity.IntegerIdentityEntityWithOperator;
import com.yihu.jw.restmodel.UuidIdentityVOWithOperator;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -19,7 +20,7 @@ import java.util.Date;
 * @since 1.
 */
@ApiModel(value = "BaseTeamMemberVO", description = "团队成员")
public class BaseTeamMemberVO extends UuidIdentityVOWithOperator {
public class BaseTeamMemberVO extends IntegerIdentityEntityWithOperator {
    /**
	 * 团队ID

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/team/BaseTeamEndpoint.java

@@ -43,7 +43,7 @@ public class BaseTeamEndpoint extends EnvelopRestEndpoint {
    @ApiOperation(value = "创建团队")
    public Envelop create(
            @ApiParam(name = " jsonData", value = "Json数据", required = true)
            @RequestParam(value = "jsonData")  String jsonData) throws Exception {
            @RequestParam(value = "jsonData", required = true) String jsonData) throws Exception {
        String msg = baseTeamService.createTeam(jsonData);
        if (StringUtils.equalsIgnoreCase(ConstantUtils.SUCCESS, msg)) {
            return success(msg);
@@ -64,7 +64,7 @@ public class BaseTeamEndpoint extends EnvelopRestEndpoint {
    @ApiOperation(value = "更新团队")
    public Envelop update(
            @ApiParam(name = " jsonData", value = "Json数据", required = true)
            @RequestParam String jsonData) throws Exception {
            @RequestParam(value = "jsonData", required = true) String jsonData) throws Exception {
        JSONObject jsonObject = baseTeamService.updateTeam(jsonData);
        if (jsonObject.getString("response").equalsIgnoreCase(ConstantUtils.FAIL)) {
            return failed(jsonObject.getString("msg"));

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/user/UserEndpoint.java

@@ -124,7 +124,7 @@ public class UserEndpoint extends EnvelopRestEndpoint {
    @GetMapping(value = BaseRequestMapping.User.findUserBaseInfo)
    @ApiOperation(value = "获取登录基本信息")
    public ObjEnvelop<Map<String,Object>> findUserBaseInfo(@ApiParam(name = "id", value = "用户id", required = true)
                                                               @RequestParam(value = "id", required = false)String id){
                                                               @RequestParam(value = "id", required = false)String id) throws Exception {
        return success(BaseRequestMapping.User.api_success,userService.findUserBaseInfo(id));
    }

svr/svr-base/src/main/java/com/yihu/jw/base/service/team/BaseTeamService.java

@@ -137,6 +137,7 @@ public class BaseTeamService extends BaseJpaService<BaseTeamDO, BaseTeamDao> {
        try {
            for(Object object : teamMembers){
                baseTeamMemberDO = objectMapper.readValue(object.toString(),BaseTeamMemberDO.class);
                baseTeamMemberDO.setTeamCode(baseTeamDO.getId());
                if(roleIdList.contains(baseTeamMemberDO.getId())){
                    roleIdList.remove(baseTeamMemberDO.getId());
                }
@@ -146,7 +147,9 @@ public class BaseTeamService extends BaseJpaService<BaseTeamDO, BaseTeamDao> {
            result.put("msg","convert teamMember jsonObject to BaseTeamMemberDO failed," + e.getCause());
            result.put("response",ConstantUtils.FAIL);
        }
        baseTeamMemberService.delete(roleIdList.toArray());
        if(roleIdList.size() > 0){
            baseTeamMemberService.delete(roleIdList.toArray());
        }
        result.put("response",ConstantUtils.SUCCESS);
        result.put("msg",baseTeamDO);
        return result;

svr/svr-base/src/main/java/com/yihu/jw/base/service/user/UserService.java

@@ -409,9 +409,7 @@ public class UserService extends BaseJpaService<UserDO, UserDao> {
                    " and  (tree.code = org.code or tree.code = org.province_code or tree.code = org.city_code or tree.code = town_code) " +
                    " ORDER BY tree.name;");
            orgList = jdbcTemplate.query(sql.toString().replace("{saasid}",saasid),new BeanPropertyRowMapper(OrgTree.class));
        }
        // 用户不为空表示修改，需要筛选出用户已经选择过的机构，设置checked为true
        else if(!StringUtils.isEmpty(userId)){
        } else if(!StringUtils.isEmpty(userId)){// 用户不为空表示修改，需要筛选出用户已经选择过的机构，设置checked为true
            Set<String> codeSet = baseOrgUserService.findorgCodeListByUserId(userId);
            orgList.forEach( one -> {
                if(codeSet.contains(one.getCode())){