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

liujie

5 天以前 f8d30932873605f5eb407228b22a38ec5ff96af9

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

@@ -5,6 +5,7 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.system.dto.TCrmClinicDTO;
import com.ruoyi.system.mapper.TCrmClinicMapper;
import com.ruoyi.system.model.TCrmClinic;
@@ -40,6 +41,17 @@

        PageInfo<TCrmClinicVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
        List<TCrmClinicVO> list = this.baseMapper.pageList(query,pageInfo);
        pageInfo.setRecords(list);
        return pageInfo;
    }

    @Override
    public PageInfo<TCrmClinicVO> pageAuditList(TCrmClinicQuery query) {

        // TODO 业绩状态查询处理

        PageInfo<TCrmClinicVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
        List<TCrmClinicVO> list = this.baseMapper.pageAuditList(query,pageInfo);
        pageInfo.setRecords(list);
        return pageInfo;
    }
@@ -83,7 +95,9 @@
            user.setPhonenumber(dto.getPhone());
            user.setUserName(dto.getPhone());
            user.setNickName(dto.getClinicName());
            user.setPassword(SecurityUtils.encryptPassword(dto.getPassword()));
            if(StringUtils.isNotEmpty(dto.getPassword())){
                user.setPassword(SecurityUtils.encryptPassword(dto.getPassword()));
            }
            sysUserService.updateUser(user);
        }
        return R.ok();