登录做权限修改、推送搜索么有数据、健康文章时间搜索没有数据问题

edu-article/JkEdu/src/com/yihu/jk/dao/ArticleDao.java

@@ -746,23 +746,23 @@ public class ArticleDao {
		StringBuffer param = new StringBuffer();
		StringBuffer pageParam = new StringBuffer();
		if (StringUtil.isNotEmpty(vo.getFirstLevelCategoryId())) {
			param.append(" and FirstLevelCategoryId = ? ");
			param.append(" and m.FirstLevelCategoryId = ? ");
			sql.addParamValue(vo.getFirstLevelCategoryId());
		}
		if (StringUtil.isNotEmpty(vo.getSecondLevelCategoryId())) {
			param.append(" and SecondLevelCategoryId = ? ");
			param.append(" and m.SecondLevelCategoryId = ? ");
			sql.addParamValue(vo.getSecondLevelCategoryId());
		}
		if (StringUtil.isNotEmpty(vo.getStartTime())) {
			param.append(" and InsertTime >= ? ");
			param.append(" and m.InsertTime >= ? ");
			sql.addParamValue(vo.getStartTime());
		}
		if (StringUtil.isNotEmpty(vo.getEndTime())) {
			param.append(" and InsertTime <= ? ");
			param.append(" and m.InsertTime <= ? ");
			sql.addParamValue(vo.getEndTime());
		}
		if (StringUtil.isNotEmpty(vo.getArticlelevel())) {
			param.append(" and Articlelevel = ? ");
			param.append(" and m.Articlelevel = ? ");
			sql.addParamValue(vo.getArticlelevel());
		}
		if (vo.getIsAuthentication() != null ) {
@@ -791,27 +791,27 @@ public class ArticleDao {
		StringBuffer param2 = new StringBuffer();
        StringBuffer pageParam = new StringBuffer();
        if (StringUtil.isNotEmpty(vo.getFirstLevelCategoryId())) {
            param.append(" and FirstLevelCategoryId = ? ");
            param.append(" and m.FirstLevelCategoryId = ? ");
            sql.addParamValue(vo.getFirstLevelCategoryId());
        }
        if (StringUtil.isNotEmpty(vo.getSecondLevelCategoryId())) {
            param.append(" and SecondLevelCategoryId = ? ");
            param.append(" and m.SecondLevelCategoryId = ? ");
            sql.addParamValue(vo.getSecondLevelCategoryId());
        }
        if (StringUtil.isNotEmpty(vo.getStartTime())) {
            param.append(" and InsertTime >= ? ");
            param.append(" and m.InsertTime >= ? ");
            sql.addParamValue(vo.getStartTime());
        }
        if (StringUtil.isNotEmpty(vo.getEndTime())) {
            param.append(" and InsertTime <= ? ");
            param.append(" and m.InsertTime <= ? ");
            sql.addParamValue(vo.getEndTime());
        }
        if (vo.getIsAuthentication() != null ) {
            param.append(" and IsAuthentication = ? ");
            param.append(" and m.IsAuthentication = ? ");
            sql.addParamValue(vo.getIsAuthentication());
        }
        if (StringUtil.isNotEmpty(vo.getOperatorRoleLevel())) {
            param.append(" and OperatorRoleLevel = ? ");
            param.append(" and m.OperatorRoleLevel = ? ");
            sql.addParamValue(vo.getOperatorRoleLevel());
        }
		if (StringUtil.isNotEmpty(vo.getArticleTitle())) {
@@ -819,7 +819,7 @@ public class ArticleDao {
			sql.addParamValue("%"+vo.getArticleTitle()+"%");
		}
        if (StringUtil.isNotEmpty(vo.getOperatorRoleCode())) {
            param.append(" and OperatorRoleCode ='"+vo.getOperatorRoleCode()+"' ");
            param.append(" and m.OperatorRoleCode ='"+vo.getOperatorRoleCode()+"' ");
        }
        sql.addVar("@Condition", param.toString());
        sql.addVar("@PageParam", pageParam.toString());

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/jimeiJkEdu/JMJkEduArticleService.java

@@ -131,7 +131,7 @@ public class JMJkEduArticleService extends BaseService {
//        sql2.append(" and currentUserRoleCode ="+currentUserRole);
//        sql2.append(" and currentUserRoleLevel="+currentUserRoleLevel);
        if(!StringUtils.isEmpty(articleTitle)){
            sql2.append(" and articleTitle like'%"+articleTitle+"%'");
            sql2.append(" and articleTitle like '%"+articleTitle+"%'");
        }
        if(!StringUtils.isEmpty(sendTimeStart)){
            sendTimeStart = elasticsearchUtil.changeTime(sendTimeStart);

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/common/account/LoginController.java

@@ -7,6 +7,7 @@ import com.yihu.wlyy.entity.patient.Patient;
import com.yihu.wlyy.entity.security.Token;
import com.yihu.wlyy.repository.doctor.DoctorDao;
import com.yihu.wlyy.repository.security.TokenDao;
import com.yihu.wlyy.service.app.account.DoctorInfoService;
import com.yihu.wlyy.service.common.SMSService;
import com.yihu.wlyy.service.common.account.DoctorService;
import com.yihu.wlyy.service.common.account.PatientService;
@@ -73,6 +74,8 @@ public class LoginController extends BaseController {
    private LoginLogService loginLogService;
    @Autowired
    private RSAUtils rsaUtils;
    @Autowired
    private DoctorInfoService doctorInfoService;
    /**
@@ -191,7 +194,12 @@ public class LoginController extends BaseController {
                        one.put("name", doctor.getHospitalName());
                        one.put("areas", "");
                        one.put("level","4");
                        one.put("authOperate", "0");
                        List<Map<String, Object>> list = doctorInfoService.getDoctorManagerRole(doctor.getCode(),"Manage_Article_Authentication");
                        if(list.size()>0&&!org.springframework.util.StringUtils.isEmpty(list.get(0).get("code"))){
                            one.put("authOperate", "1");
                        }else{
                            one.put("authOperate", "0");
                        }
                        map.put("currentUserRole", one);
                    }
                    if ("10" .equals(doctor.getLevel()) && roleMap.size() == 0) {
@@ -272,6 +280,7 @@ public class LoginController extends BaseController {
                    //获取医生角色和区域权限
                    List<Map<String, String>> roleMap = roleService.getUserRoleAndArea(doctor.getCode());
                    map.put("userRole", roleMap);
                    //医生当前登录的角色
                     if(roleMap.size()>0){
@@ -285,13 +294,18 @@ public class LoginController extends BaseController {
                        }
                    }else{
                        Map<String, String> one = new HashMap<>();
                         one.put("isManage","0");
                         one.put("code", doctor.getHospital());
                         one.put("name", doctor.getHospitalName());
                         one.put("areas", "");
                         one.put("level","4");
                         one.put("authOperate", "0");
                         map.put("currentUserRole", one);
                        one.put("isManage","0");
                        one.put("code", doctor.getHospital());
                        one.put("name", doctor.getHospitalName());
                        one.put("areas", "");
                        one.put("level","4");
                        List<Map<String, Object>> list = doctorInfoService.getDoctorManagerRole(doctor.getCode(),"Manage_Article_Authentication");
                        if(list.size()>0&&!org.springframework.util.StringUtils.isEmpty(list.get(0).get("code"))){
                            one.put("authOperate", "1");
                        }else{
                            one.put("authOperate", "0");
                        }
                        map.put("currentUserRole", one);
                    }
                    if ("10" .equals(doctor.getLevel()) && roleMap.size() == 0) {
                        errorMessage = "改用户没有管理员权限";