【市一】随访增加院区限制

陈昶聿

13 小时以前 65f3f3033ec7b8da30c732b694e532d058348a47

【市一】随访增加院区限制

 ruoyi-common/src/main/java/com/ruoyi/common/aspectj/SetOrgIdAspect.java

@@ -2,13 +2,16 @@

import com.ruoyi.common.annotation.AddOrgId;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.core.service.IConfigService;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import org.aspectj.lang.JoinPoint;
import org.aspectj.lang.annotation.Aspect;
import org.aspectj.lang.annotation.Before;
import org.aspectj.lang.reflect.MethodSignature;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

import java.lang.reflect.Field;
@@ -25,6 +28,9 @@
{
    private static final Logger log = LoggerFactory.getLogger(SetOrgIdAspect.class);

    @Autowired
    private IConfigService sysConfigService;

    @Before("@annotation(setOrgId)")
    public void setOrgId(JoinPoint joinPoint, AddOrgId setOrgId) throws Throwable
    {
@@ -36,6 +42,14 @@
            {
                String orgid = loginUser.getUser().getOrgid();
                String campusid = loginUser.getUser().getCampusid();
                //显示所有院区权限
                String allCampus = sysConfigService.selectConfigByKey("sys.authority.campus.all");
                if(StringUtils.isNotEmpty(allCampus)){
                    allCampus = "," + allCampus + ",";
                    if (allCampus.contains("," + loginUser.getUser().getUserName() + ",")) {
                        campusid = null;
                    }
                }
                
                // 获取方法参数
                Object[] args = joinPoint.getArgs();

 smartor/src/main/java/com/smartor/domain/ServiceTask.java

@@ -258,6 +258,7 @@
    /**
     * 院区ID
     */
    @Excel(name = " 院区ID ")
    @ApiModelProperty(value = "院区ID")
    private String campusid;


 smartor/src/main/resources/mapper/smartor/ServiceTaskMapper.xml

@@ -30,6 +30,7 @@
        <result property="isupload" column="isupload"/>
        <result property="uploadTime" column="upload_time"/>
        <result property="orgid" column="orgid"/>
        <result property="campusid" column="campusid"/>
        <result property="pid" column="pid"/>
        <result property="guid" column="guid"/>
        <result property="preachform" column="preachform"/>
@@ -115,6 +116,7 @@
               leavehospitaldistrictcode,
               leavehospitaldistrictname,
               orgid,
               campusid,
               nexttaskflag,
               nexttaskid,
               nexttaskname,
@@ -161,6 +163,7 @@
        <if test="isupload != null ">and isupload = #{isupload}</if>
        <if test="uploadTime != null ">and upload_time = #{uploadTime}</if>
        <if test="orgid != null  and orgid != ''">and orgid = #{orgid}</if>
        <if test="campusid != null  and campusid != ''">and campusid = #{campusid}</if>
        <if test="compensateDate != null  and compensateDate != ''">and compensate_date = #{compensateDate}</if>
        <if test="hospType != null  and hospType != ''">and hosp_type = #{hospType}</if>
        <if test="libtemplateid != null ">and libtemplateid = #{libtemplateid}</if>
@@ -252,7 +255,8 @@
        service_task.nexttaskflag,
        service_task.nexttaskid,
        service_task.nexttaskname,
        service_task.orgid from service_task
        service_task.orgid,
        service_task.campusid from service_task
        where 1=1
        and service_task.del_flag = 0
        <!--            and taskid in (-->
@@ -343,6 +347,7 @@
        <if test="isupload != null ">and service_task.isupload = #{isupload}</if>
        <if test="uploadTime != null ">and service_task.upload_time = #{uploadTime}</if>
        <if test="orgid != null  and orgid != ''">and service_task.orgid = #{orgid}</if>
        <if test="campusid != null  and campusid != ''">and service_task.campusid = #{campusid}</if>
        <if test="compensateDate != null  and compensateDate != ''">and service_task.compensate_date =
            #{compensateDate}
        </if>
@@ -370,6 +375,7 @@
        <if test="isupload != null ">and service_task.isupload = #{isupload}</if>
        <if test="uploadTime != null ">and service_task.upload_time = #{uploadTime}</if>
        <if test="orgid != null  and orgid != ''">and service_task.orgid = #{orgid}</if>
        <if test="campusid != null  and campusid != ''">and service_task.campusid = #{campusid}</if>
        <if test="compensateDate != null  and compensateDate != ''">and service_task.compensate_date =
            #{compensateDate}
        </if>
@@ -455,6 +461,7 @@
            <if test="isupload != null">isupload,</if>
            <if test="uploadTime != null">upload_time,</if>
            <if test="orgid != null">orgid,</if>
            <if test="campusid != null and campusid != ''">campusid,</if>
            <if test="pid != null">pid,</if>
            <if test="guid != null">guid,</if>
            <if test="preachform != null">preachform,</if>
@@ -508,6 +515,7 @@
            <if test="isupload != null">#{isupload},</if>
            <if test="uploadTime != null">#{uploadTime},</if>
            <if test="orgid != null">#{orgid},</if>
            <if test="campusid != null and campusid != ''">#{campusid},</if>
            <if test="nexttaskflag != null">#{nexttaskflag},</if>
            <if test="nexttaskid != null">#{nexttaskid},</if>
            <if test="nexttaskname != null">#{nexttaskname},</if>
@@ -568,6 +576,7 @@
            <if test="isupload != null">isupload = #{isupload},</if>
            <if test="uploadTime != null">upload_time = #{uploadTime},</if>
            <if test="orgid != null">orgid = #{orgid},</if>
            <if test="campusid != null and campusid != ''">campusid = #{campusid},</if>
            <if test="nexttaskflag != null">nexttaskflag = #{nexttaskflag},</if>
            <if test="nexttaskid != null">nexttaskid = #{nexttaskid},</if>
            <if test="nexttaskname != null and nexttaskname!=''">nexttaskname = #{nexttaskname},</if>