bug对应

common/common-request-mapping/src/main/java/com/yihu/jw/rm/base/BaseRequestMapping.java

@@ -416,6 +416,7 @@ public class BaseRequestMapping {
        public static final String CHECK_POPULATION_IS_EXIST  = "/checkBasePopulationIsExist";
        public static final String POPULATION_BATCH_IMPORT  = "/basePopulationBatchImport";
        public static final String POPULATION_BATCH_ERROR_DOENLOAD  = "/basePopulationBatchErrorDownLoad";
        public static final String POPULATION_BODY_BATCH_IMPORT  = "/basePopulationBodyBatchImport";
    }

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/saas/SaasEndpoint.java

@@ -184,22 +184,24 @@ public class SaasEndpoint extends EnvelopRestEndpoint {
        }
        saasDO.setStatus(status);
        saasDO.setAuditFailedReason(auditFailedReason);
        //用户信息初始化
        UserDO userDO = new UserDO();
        userDO.setEmail(saasDO.getEmail());
        userDO.setMobile(saasDO.getMobile());
        userDO.setName(saasDO.getManagerName());
        userDO.setUsername(userDO.getEmail());
        //初始化租户信息
        saasService.save(saasDO);
        saasDO = saasService.saasAudit(saasDO, userDO);
        return send(saasDO);
    }
    @GetMapping("/sendEmail")
    @ApiOperation(value = "邮件发送")
    public ObjEnvelop<SaasDO> send(SaasDO saasDO) {
        try {
            SaasDO.Status status = saasDO.getStatus();
            //用户信息初始化
            UserDO userDO = new UserDO();
            userDO.setEmail(saasDO.getEmail());
            userDO.setMobile(saasDO.getMobile());
            userDO.setName(saasDO.getManagerName());
            userDO.setUsername(userDO.getEmail());
            String password = userDO.getMobile().substring(0, 6);
            String password = saasDO.getMobile().substring(0, 6);
            BaseEmailTemplateConfigDO baseEmailTemplateConfigDO = baseEmailTemplateConfigService.findByCode(status.name());
            if (null == baseEmailTemplateConfigDO) {
                failed(status.name() + "邮件模板不存在！");
@@ -219,7 +221,7 @@ public class SaasEndpoint extends EnvelopRestEndpoint {
            content.append(baseEmailTemplateConfigDO.getKeyword2() + "\n");
            if (status.equals(SaasDO.Status.auditPassed)) {
                //账号
                content.append(baseEmailTemplateConfigDO.getKeyword3() + userDO.getMobile() + "\n");
                content.append(baseEmailTemplateConfigDO.getKeyword3() + saasDO.getMobile() + "\n");
                //密码
                content.append(baseEmailTemplateConfigDO.getKeyword4() + password + "\n");
            } else if (status.equals(SaasDO.Status.auditNotPassed)) {
@@ -230,11 +232,9 @@ public class SaasEndpoint extends EnvelopRestEndpoint {
            content.append(baseEmailTemplateConfigDO.getRemark());
            mainMessage.setText(content.toString());
            jms.send(mainMessage);
            //发送成功后，初始化租户信息
            saasDO = saasService.saasAudit(saasDO, userDO);
        } catch (MailException e) {
            e.printStackTrace();
            return success("审核完成", saasDO);
            return failed("邮件发送失败！"+e.getMessage(),ObjEnvelop.class);
        }
        return success("审核完成", saasDO);
    }

svr/svr-base/src/main/java/com/yihu/jw/base/service/population/BasePopulationService.java

@@ -5,12 +5,13 @@ import com.yihu.jw.base.endpoint.common.populationBatchImport.PopulationMsg;
import com.yihu.jw.entity.base.population.BasePopulationDO;
import com.yihu.jw.exception.business.ManageException;
import com.yihu.mysql.query.BaseJpaService;
import org.apache.commons.lang.StringUtils;
import org.hibernate.Query;
import org.hibernate.SQLQuery;
import org.hibernate.Session;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.math.BigInteger;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -92,4 +93,14 @@ public class BasePopulationService extends BaseJpaService<BasePopulationDO, Base
        return query.list();
    }
    public Boolean checkPopulationName(String id,String saasId, String year) {
        String hql = "SELECT count(1)  FROM  base_population p WHERE p.saas_id=:saasId AND  p.year=:year AND  p.id != :id";
        SQLQuery sqlQuery = currentSession().createSQLQuery(hql);
        sqlQuery.setParameter("id", id);
        sqlQuery.setParameter("saasId", saasId);
        sqlQuery.setParameter("year", year);
        BigInteger count = (BigInteger) sqlQuery.uniqueResult();
        return count.compareTo(new BigInteger("0")) > 0;
    }
}

svr/svr-base/src/main/java/com/yihu/jw/base/service/saas/SaasService.java

@@ -310,6 +310,7 @@ public class SaasService extends BaseJpaService<SaasDO, SaasDao> {
        user.setEnabled(true);
        user.setLocked(false);
        user.setSalt(randomString(5));
        user.setName(user.getEmail());
        String password = user.getPassword();
        //密码默认手机号后6位
        if (StringUtils.isEmpty(password)) {