Ver código fonte

新增和编辑的时候,记录的是用户的ID 列表和详情再额外返回用户明细

王苗苗 2 semanas atrás
pai
commit
e25ae0409d

+ 8 - 0
ruoyi-system/src/main/java/com/ruoyi/business/domain/BizDevice.java

@@ -2,6 +2,7 @@ package com.ruoyi.business.domain;
 
 import java.util.Date;
 
+import com.ruoyi.common.core.domain.entity.SysUser;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -131,4 +132,11 @@ public class BizDevice extends BaseEntity
     //额外返回的字段
     //关联的水厂/集团信息
     private TOrganization organization;
+
+    //2025年03月13日10:46:18 返回创建人的全部信息,createBy存放的ID了
+    //创建人
+    private SysUser createUser;
+
+    //更新人
+    private SysUser updateUser;
 }

+ 8 - 0
ruoyi-system/src/main/java/com/ruoyi/business/domain/TAssayItem.java

@@ -1,5 +1,6 @@
 package com.ruoyi.business.domain;
 
+import com.ruoyi.common.core.domain.entity.SysUser;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -57,4 +58,11 @@ public class TAssayItem extends BaseEntity
     //药剂总量
     private BigDecimal yjAmount;
 
+    //2025年03月13日10:46:18 返回创建人的全部信息,createBy存放的ID了
+    //创建人
+    private SysUser createUser;
+
+    //更新人
+    private SysUser updateUser;
+
 }

+ 8 - 0
ruoyi-system/src/main/java/com/ruoyi/business/domain/TAssayWorkflow.java

@@ -1,5 +1,6 @@
 package com.ruoyi.business.domain;
 
+import com.ruoyi.common.core.domain.entity.SysUser;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -64,4 +65,11 @@ public class TAssayWorkflow extends BaseEntity
 
     private List<TAssayWorkflowItem> items;
 
+    //2025年03月13日10:46:18 返回创建人的全部信息,createBy存放的ID了
+    //创建人
+    private SysUser createUser;
+
+    //更新人
+    private SysUser updateUser;
+
 }

+ 8 - 0
ruoyi-system/src/main/java/com/ruoyi/business/domain/TMedicine.java

@@ -1,5 +1,6 @@
 package com.ruoyi.business.domain;
 
+import com.ruoyi.common.core.domain.entity.SysUser;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -41,4 +42,11 @@ public class TMedicine extends BaseEntity
     @Excel(name = "乐观锁")
     private Long revision;
 
+    //2025年03月13日10:46:18 返回创建人的全部信息,createBy存放的ID了
+    //创建人
+    private SysUser createUser;
+
+    //更新人
+    private SysUser updateUser;
+
 }

+ 8 - 0
ruoyi-system/src/main/java/com/ruoyi/business/domain/TOrganization.java

@@ -1,5 +1,6 @@
 package com.ruoyi.business.domain;
 
+import com.ruoyi.common.core.domain.entity.SysUser;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -118,6 +119,13 @@ public class TOrganization extends BaseEntity
     @Excel(name = "区县的名称")
     private String countryName;
 
+    //2025年03月13日10:46:18 返回创建人的全部信息,createBy存放的ID了
+    //创建人
+    private SysUser createUser;
+
+    //更新人
+    private SysUser updateUser;
+
 
 
 }

+ 8 - 0
ruoyi-system/src/main/java/com/ruoyi/business/domain/TPosition.java

@@ -1,5 +1,6 @@
 package com.ruoyi.business.domain;
 
+import com.ruoyi.common.core.domain.entity.SysUser;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -56,5 +57,12 @@ public class TPosition extends BaseEntity
     //关联的设备信息
     private BizDevice bizDevice;
 
+    //2025年03月13日10:46:18 返回创建人的全部信息,createBy存放的ID了
+    //创建人
+    private SysUser createUser;
+
+    //更新人
+    private SysUser updateUser;
+
 
 }

+ 8 - 0
ruoyi-system/src/main/java/com/ruoyi/business/domain/TQualityConf.java

@@ -3,6 +3,7 @@ package com.ruoyi.business.domain;
 import java.math.BigDecimal;
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.entity.SysUser;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -77,4 +78,11 @@ public class TQualityConf extends BaseEntity
     //关联的化验项目
     private TAssayItem assayItem;
 
+    //2025年03月13日10:46:18 返回创建人的全部信息,createBy存放的ID了
+    //创建人
+    private SysUser createUser;
+
+    //更新人
+    private SysUser updateUser;
+
 }

+ 17 - 0
ruoyi-system/src/main/java/com/ruoyi/business/service/impl/BizDeviceServiceImpl.java

@@ -5,6 +5,9 @@ import java.util.Objects;
 
 import com.ruoyi.business.mapper.TOrganizationMapper;
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.system.mapper.SysUserMapper;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -27,6 +30,9 @@ public class BizDeviceServiceImpl implements IBizDeviceService
     @Autowired
     private TOrganizationMapper organizationMapper;
 
+    @Autowired
+    private SysUserMapper sysUserMapper;
+
     /**
      * 查询设备
      * 
@@ -66,6 +72,13 @@ public class BizDeviceServiceImpl implements IBizDeviceService
      */
     private void addExtra(BizDevice device) {
         device.setOrganization(this.organizationMapper.selectTOrganizationById(device.getDeviceWorks()));
+        //2025年03月13日11:16:04 额外返回创建人和编辑人对象
+        String createBy = device.getCreateBy();
+        String updateBy = device.getUpdateBy();
+        if(StringUtils.isNotBlank(createBy))
+            device.setCreateUser(this.sysUserMapper.selectUserById(Long.valueOf(createBy)));
+        if(StringUtils.isNotBlank(updateBy))
+            device.setUpdateUser(this.sysUserMapper.selectUserById(Long.valueOf(updateBy)));
     }
 
     /**
@@ -78,6 +91,8 @@ public class BizDeviceServiceImpl implements IBizDeviceService
     public int insertBizDevice(BizDevice bizDevice)
     {
         bizDevice.setCreateTime(DateUtils.getNowDate());
+        //存放的是用户ID
+        bizDevice.setCreateBy(String.valueOf(SecurityUtils.getUserId()));
         return bizDeviceMapper.insertBizDevice(bizDevice);
     }
 
@@ -91,6 +106,8 @@ public class BizDeviceServiceImpl implements IBizDeviceService
     public int updateBizDevice(BizDevice bizDevice)
     {
         bizDevice.setUpdateTime(DateUtils.getNowDate());
+        //存放的是用户ID
+        bizDevice.setUpdateBy(String.valueOf(SecurityUtils.getUserId()));
         return bizDeviceMapper.updateBizDevice(bizDevice);
     }
 

+ 18 - 0
ruoyi-system/src/main/java/com/ruoyi/business/service/impl/TAssayItemServiceImpl.java

@@ -6,6 +6,9 @@ import java.util.*;
 import com.ruoyi.business.domain.TAssayItemExtra;
 import com.ruoyi.business.mapper.TAssayItemExtraMapper;
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.system.mapper.SysUserMapper;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -28,6 +31,10 @@ public class TAssayItemServiceImpl implements ITAssayItemService
     @Autowired
     private TAssayItemExtraMapper assayItemExtraMapper;
 
+    @Autowired
+    private SysUserMapper sysUserMapper;
+
+
     /**
      * 查询化验项目
      * 
@@ -51,6 +58,13 @@ public class TAssayItemServiceImpl implements ITAssayItemService
         List<TAssayItemExtra> yjList = this.assayItemExtraMapper.selectTAssayItemExtraList(TAssayItemExtra.builder().itemId(id).type(1).build());
         tAssayItem.setYjList(yjList);
         tAssayItem.setYjAmount(yjList.stream().map(TAssayItemExtra::getAmount).reduce(BigDecimal::add).orElse(BigDecimal.ZERO));
+        //2025年03月13日11:16:04 额外返回创建人和编辑人对象
+        String createBy = tAssayItem.getCreateBy();
+        String updateBy = tAssayItem.getUpdateBy();
+        if(StringUtils.isNotBlank(createBy))
+            tAssayItem.setCreateUser(this.sysUserMapper.selectUserById(Long.valueOf(createBy)));
+        if(StringUtils.isNotBlank(updateBy))
+            tAssayItem.setUpdateUser(this.sysUserMapper.selectUserById(Long.valueOf(updateBy)));
     }
 
 
@@ -94,6 +108,8 @@ public class TAssayItemServiceImpl implements ITAssayItemService
     public int insertTAssayItem(TAssayItem tAssayItem)
     {
         tAssayItem.setCreateTime(DateUtils.getNowDate());
+        //存放的是用户ID
+        tAssayItem.setCreateBy(String.valueOf(SecurityUtils.getUserId()));
         return tAssayItemMapper.insertTAssayItem(tAssayItem);
     }
 
@@ -107,6 +123,8 @@ public class TAssayItemServiceImpl implements ITAssayItemService
     public int updateTAssayItem(TAssayItem tAssayItem)
     {
         tAssayItem.setUpdateTime(DateUtils.getNowDate());
+        //存放的是用户ID
+        tAssayItem.setUpdateBy(String.valueOf(SecurityUtils.getUserId()));
         return tAssayItemMapper.updateTAssayItem(tAssayItem);
     }
 

+ 17 - 0
ruoyi-system/src/main/java/com/ruoyi/business/service/impl/TAssayWorkflowServiceImpl.java

@@ -7,6 +7,9 @@ import java.util.Objects;
 import com.ruoyi.business.domain.TAssayWorkflowItem;
 import com.ruoyi.business.mapper.*;
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.system.mapper.SysUserMapper;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -40,6 +43,9 @@ public class TAssayWorkflowServiceImpl implements ITAssayWorkflowService
     @Autowired
     private TAssayItemMapper assayItemMapper;
 
+    @Autowired
+    private SysUserMapper sysUserMapper;
+
     /**
      * 查询化验流程
      * 
@@ -70,6 +76,13 @@ public class TAssayWorkflowServiceImpl implements ITAssayWorkflowService
             }
         }
         tAssayWorkflow.setItems(tAssayWorkflowItems);
+        //2025年03月13日11:16:04 额外返回创建人和编辑人对象
+        String createBy = tAssayWorkflow.getCreateBy();
+        String updateBy = tAssayWorkflow.getUpdateBy();
+        if(StringUtils.isNotBlank(createBy))
+            tAssayWorkflow.setCreateUser(this.sysUserMapper.selectUserById(Long.valueOf(createBy)));
+        if(StringUtils.isNotBlank(updateBy))
+            tAssayWorkflow.setUpdateUser(this.sysUserMapper.selectUserById(Long.valueOf(updateBy)));
     }
 
     /**
@@ -100,6 +113,8 @@ public class TAssayWorkflowServiceImpl implements ITAssayWorkflowService
     public int insertTAssayWorkflow(TAssayWorkflow tAssayWorkflow)
     {
         tAssayWorkflow.setCreateTime(DateUtils.getNowDate());
+        //存放的是用户ID
+        tAssayWorkflow.setCreateBy(String.valueOf(SecurityUtils.getUserId()));
         return tAssayWorkflowMapper.insertTAssayWorkflow(tAssayWorkflow);
     }
 
@@ -113,6 +128,8 @@ public class TAssayWorkflowServiceImpl implements ITAssayWorkflowService
     public int updateTAssayWorkflow(TAssayWorkflow tAssayWorkflow)
     {
         tAssayWorkflow.setUpdateTime(DateUtils.getNowDate());
+        //存放的是用户ID
+        tAssayWorkflow.setUpdateBy(String.valueOf(SecurityUtils.getUserId()));
         return tAssayWorkflowMapper.updateTAssayWorkflow(tAssayWorkflow);
     }
 

+ 34 - 2
ruoyi-system/src/main/java/com/ruoyi/business/service/impl/TMedicineServiceImpl.java

@@ -1,7 +1,13 @@
 package com.ruoyi.business.service.impl;
 
 import java.util.List;
+import java.util.Objects;
+
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.system.mapper.SysUserMapper;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.business.mapper.TMedicineMapper;
@@ -20,6 +26,9 @@ public class TMedicineServiceImpl implements ITMedicineService
     @Autowired
     private TMedicineMapper tMedicineMapper;
 
+    @Autowired
+    private SysUserMapper sysUserMapper;
+
     /**
      * 查询药剂管理
      * 
@@ -29,7 +38,20 @@ public class TMedicineServiceImpl implements ITMedicineService
     @Override
     public TMedicine selectTMedicineById(Long id)
     {
-        return tMedicineMapper.selectTMedicineById(id);
+        TMedicine tMedicine = tMedicineMapper.selectTMedicineById(id);
+        if(!Objects.isNull(tMedicine))
+            this.addExtra(tMedicine);
+        return tMedicine;
+    }
+
+    private void addExtra(TMedicine tMedicine) {
+        //2025年03月13日11:16:04 额外返回创建人和编辑人对象
+        String createBy = tMedicine.getCreateBy();
+        String updateBy = tMedicine.getUpdateBy();
+        if(StringUtils.isNotBlank(createBy))
+            tMedicine.setCreateUser(this.sysUserMapper.selectUserById(Long.valueOf(createBy)));
+        if(StringUtils.isNotBlank(updateBy))
+            tMedicine.setUpdateUser(this.sysUserMapper.selectUserById(Long.valueOf(updateBy)));
     }
 
     /**
@@ -41,7 +63,13 @@ public class TMedicineServiceImpl implements ITMedicineService
     @Override
     public List<TMedicine> selectTMedicineList(TMedicine tMedicine)
     {
-        return tMedicineMapper.selectTMedicineList(tMedicine);
+        List<TMedicine> tMedicines = tMedicineMapper.selectTMedicineList(tMedicine);
+        if(!CollectionUtils.isEmpty(tMedicines)){
+            for (TMedicine medicine : tMedicines) {
+                this.addExtra(medicine);
+            }
+        }
+        return tMedicines;
     }
 
     /**
@@ -54,6 +82,8 @@ public class TMedicineServiceImpl implements ITMedicineService
     public int insertTMedicine(TMedicine tMedicine)
     {
         tMedicine.setCreateTime(DateUtils.getNowDate());
+        //存放的是用户ID
+        tMedicine.setCreateBy(String.valueOf(SecurityUtils.getUserId()));
         return tMedicineMapper.insertTMedicine(tMedicine);
     }
 
@@ -67,6 +97,8 @@ public class TMedicineServiceImpl implements ITMedicineService
     public int updateTMedicine(TMedicine tMedicine)
     {
         tMedicine.setUpdateTime(DateUtils.getNowDate());
+        //存放的是用户ID
+        tMedicine.setUpdateBy(String.valueOf(SecurityUtils.getUserId()));
         return tMedicineMapper.updateTMedicine(tMedicine);
     }
 

+ 25 - 0
ruoyi-system/src/main/java/com/ruoyi/business/service/impl/TOrganizationServiceImpl.java

@@ -7,6 +7,9 @@ import com.ruoyi.business.domain.BizDevice;
 import com.ruoyi.business.mapper.BizDeviceMapper;
 import com.ruoyi.business.mapper.SysRegionMapper;
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.system.mapper.SysUserMapper;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -32,6 +35,9 @@ public class TOrganizationServiceImpl implements ITOrganizationService
     @Autowired
     private SysRegionMapper sysRegionMapper;
 
+    @Autowired
+    private SysUserMapper sysUserMapper;
+
     /**
      * 查询机构管理
      * 
@@ -60,6 +66,14 @@ public class TOrganizationServiceImpl implements ITOrganizationService
         organization.setProvinceName(this.sysRegionMapper.selectNameByCode(organization.getProvinceCode()));
         organization.setCityName(this.sysRegionMapper.selectNameByCode(organization.getCityCode()));
         organization.setCountryName(this.sysRegionMapper.selectNameByCode(organization.getCountryCode()));
+        //2025年03月13日11:16:04 额外返回创建人和编辑人对象
+        String createBy = organization.getCreateBy();
+        String updateBy = organization.getUpdateBy();
+        if(StringUtils.isNotBlank(createBy))
+            organization.setCreateUser(this.sysUserMapper.selectUserById(Long.valueOf(createBy)));
+        if(StringUtils.isNotBlank(updateBy))
+            organization.setUpdateUser(this.sysUserMapper.selectUserById(Long.valueOf(updateBy)));
+
 
         //如果是集团,获取下面的所有的水厂列表
         Integer type = organization.getType();
@@ -74,6 +88,13 @@ public class TOrganizationServiceImpl implements ITOrganizationService
                     tOrganization.setProvinceName(this.sysRegionMapper.selectNameByCode(tOrganization.getProvinceCode()));
                     tOrganization.setCityName(this.sysRegionMapper.selectNameByCode(tOrganization.getCityCode()));
                     tOrganization.setCountryName(this.sysRegionMapper.selectNameByCode(tOrganization.getCountryCode()));
+                    //2025年03月13日11:16:04 额外返回创建人和编辑人对象
+                    createBy = tOrganization.getCreateBy();
+                    updateBy = tOrganization.getUpdateBy();
+                    if(StringUtils.isNotBlank(createBy))
+                        tOrganization.setCreateUser(this.sysUserMapper.selectUserById(Long.valueOf(createBy)));
+                    if(StringUtils.isNotBlank(updateBy))
+                        tOrganization.setUpdateUser(this.sysUserMapper.selectUserById(Long.valueOf(updateBy)));
                 }
             }
             organization.setChildren(tOrganizations);
@@ -108,6 +129,8 @@ public class TOrganizationServiceImpl implements ITOrganizationService
     public int insertTOrganization(TOrganization tOrganization)
     {
         tOrganization.setCreateTime(DateUtils.getNowDate());
+        //存放的是用户ID
+        tOrganization.setCreateBy(String.valueOf(SecurityUtils.getUserId()));
         return tOrganizationMapper.insertTOrganization(tOrganization);
     }
 
@@ -121,6 +144,8 @@ public class TOrganizationServiceImpl implements ITOrganizationService
     public int updateTOrganization(TOrganization tOrganization)
     {
         tOrganization.setUpdateTime(DateUtils.getNowDate());
+        //存放的是用户ID
+        tOrganization.setUpdateBy(String.valueOf(SecurityUtils.getUserId()));
         return tOrganizationMapper.updateTOrganization(tOrganization);
     }
 

+ 17 - 0
ruoyi-system/src/main/java/com/ruoyi/business/service/impl/TPositionServiceImpl.java

@@ -6,6 +6,9 @@ import java.util.Objects;
 import com.ruoyi.business.mapper.BizDeviceMapper;
 import com.ruoyi.business.mapper.TOrganizationMapper;
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.system.mapper.SysUserMapper;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -31,6 +34,9 @@ public class TPositionServiceImpl implements ITPositionService
     @Autowired
     private BizDeviceMapper deviceMapper;
 
+    @Autowired
+    private SysUserMapper sysUserMapper;
+
     /**
      * 查询取样点位
      * 
@@ -49,6 +55,13 @@ public class TPositionServiceImpl implements ITPositionService
     private void addExtra(TPosition tPosition) {
         tPosition.setOrganization(this.organizationMapper.selectTOrganizationById(tPosition.getOrganizationId()));
         tPosition.setBizDevice(this.deviceMapper.selectBizDeviceByDeviceId(tPosition.getDeviceId()));
+        //2025年03月13日11:16:04 额外返回创建人和编辑人对象
+        String createBy = tPosition.getCreateBy();
+        String updateBy = tPosition.getUpdateBy();
+        if(StringUtils.isNotBlank(createBy))
+            tPosition.setCreateUser(this.sysUserMapper.selectUserById(Long.valueOf(createBy)));
+        if(StringUtils.isNotBlank(updateBy))
+            tPosition.setUpdateUser(this.sysUserMapper.selectUserById(Long.valueOf(updateBy)));
     }
 
     /**
@@ -79,6 +92,8 @@ public class TPositionServiceImpl implements ITPositionService
     public int insertTPosition(TPosition tPosition)
     {
         tPosition.setCreateTime(DateUtils.getNowDate());
+        //存放的是用户ID
+        tPosition.setCreateBy(String.valueOf(SecurityUtils.getUserId()));
         return tPositionMapper.insertTPosition(tPosition);
     }
 
@@ -92,6 +107,8 @@ public class TPositionServiceImpl implements ITPositionService
     public int updateTPosition(TPosition tPosition)
     {
         tPosition.setUpdateTime(DateUtils.getNowDate());
+        //存放的是用户ID
+        tPosition.setUpdateBy(String.valueOf(SecurityUtils.getUserId()));
         return tPositionMapper.updateTPosition(tPosition);
     }
 

+ 17 - 0
ruoyi-system/src/main/java/com/ruoyi/business/service/impl/TQualityConfServiceImpl.java

@@ -7,6 +7,9 @@ import java.util.Objects;
 import com.ruoyi.business.mapper.TAssayItemMapper;
 import com.ruoyi.business.mapper.TOrganizationMapper;
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.system.mapper.SysUserMapper;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -32,6 +35,9 @@ public class TQualityConfServiceImpl implements ITQualityConfService
     @Autowired
     private TAssayItemMapper assayItemMapper;
 
+    @Autowired
+    private SysUserMapper sysUserMapper;
+
     /**
      * 查询质控样配置
      * 
@@ -50,6 +56,13 @@ public class TQualityConfServiceImpl implements ITQualityConfService
     private void addExtra(TQualityConf qualityConf) {
         qualityConf.setOrganization(this.organizationMapper.selectTOrganizationById(qualityConf.getOrganizationId()));
         qualityConf.setAssayItem(this.assayItemMapper.selectTAssayItemById(qualityConf.getItemId()));
+        //2025年03月13日11:16:04 额外返回创建人和编辑人对象
+        String createBy = qualityConf.getCreateBy();
+        String updateBy = qualityConf.getUpdateBy();
+        if(StringUtils.isNotBlank(createBy))
+            qualityConf.setCreateUser(this.sysUserMapper.selectUserById(Long.valueOf(createBy)));
+        if(StringUtils.isNotBlank(updateBy))
+            qualityConf.setUpdateUser(this.sysUserMapper.selectUserById(Long.valueOf(updateBy)));
     }
 
     /**
@@ -80,6 +93,8 @@ public class TQualityConfServiceImpl implements ITQualityConfService
     public int insertTQualityConf(TQualityConf tQualityConf)
     {
         tQualityConf.setCreateTime(DateUtils.getNowDate());
+        //存放的是用户ID
+        tQualityConf.setCreateBy(String.valueOf(SecurityUtils.getUserId()));
         return tQualityConfMapper.insertTQualityConf(tQualityConf);
     }
 
@@ -93,6 +108,8 @@ public class TQualityConfServiceImpl implements ITQualityConfService
     public int updateTQualityConf(TQualityConf tQualityConf)
     {
         tQualityConf.setUpdateTime(DateUtils.getNowDate());
+        //存放的是用户ID
+        tQualityConf.setUpdateBy(String.valueOf(SecurityUtils.getUserId()));
         return tQualityConfMapper.updateTQualityConf(tQualityConf);
     }