Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/haizhentong

liujie

22 小时以前 c8f6f175a23e15b40309cf31850ee170d8d946ca

Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/haizhentong

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCrmClinicController.java

@@ -127,6 +127,12 @@
    @ApiOperation(value = "添加crm诊所管理")
    @PostMapping(value = "/add")
    public R<Boolean> add(@Validated @RequestBody TCrmClinicDTO dto) {
        Integer roleType = tokenService.getLoginUser().getUser().getRoleType();
        if (roleType == 1){
            dto.setStatus(3);
        }else {
            dto.setStatus(1);
        }
        return crmClinicService.addClinic(dto);
    }


 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TCrmClinicServiceImpl.java

@@ -63,7 +63,6 @@
        if(Objects.nonNull(sysUser)){
            return R.fail(dto.getPhone()+"-账号已存在");
        }
        dto.setStatus(1);
        this.save(dto);
        // 添加账号
        SysUser user = new SysUser();

 ruoyi-system/src/main/resources/mapper/system/TCrmClinicMapper.xml

@@ -67,6 +67,7 @@
            <if test="query.salespersonId != null and query.userId == 3">
                and tcc.salesperson_id = #{query.salespersonId}
            </if>
            and tcc.status in (3,4)
            AND tcc.disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
        </where>
        ORDER BY tcc.create_time DESC