kangwei: material_info 表添加：user_id 用户编号

@@ -154,6 +154,8 @@ public class MaterialInfoController {
         Page<MaterialInfo> page = new Page<MaterialInfo>(pageNo, pageSize);
         Page<MaterialInfo> page = new Page<MaterialInfo>(pageNo, pageSize);
         QueryWrapper<MaterialInfo> queryWrapper = getMaterialInfoQueryWrapper(materialInfo);
         QueryWrapper<MaterialInfo> queryWrapper = getMaterialInfoQueryWrapper(materialInfo);
         //queryWrapper.in("status","'1','2'");
         //queryWrapper.in("status","'1','2'");
+        queryWrapper.eq("user_id",BaseContextHandler.getUserId());
+
         IPage<MaterialInfo> pageList = materialInfoService.page(page, queryWrapper);
         IPage<MaterialInfo> pageList = materialInfoService.page(page, queryWrapper);
         result.setSuccess(true);
         result.setSuccess(true);
         result.setResult(pageList);
         result.setResult(pageList);
@@ -164,14 +166,16 @@ public class MaterialInfoController {
     private QueryWrapper<MaterialInfo> getMaterialInfoQueryWrapper(MaterialInfo materialInfo){
     private QueryWrapper<MaterialInfo> getMaterialInfoQueryWrapper(MaterialInfo materialInfo){
         QueryWrapper<MaterialInfo> queryWrapper = new QueryWrapper();
         QueryWrapper<MaterialInfo> queryWrapper = new QueryWrapper();
         String departIds = null;
         String departIds = null;
-        if (StringUtils.isBlank(materialInfo.getDepartId())&&StringUtils.isNotBlank(BaseContextHandler.getDeparts())) {
-            departIds = departService.getChildDepartId(BaseContextHandler.getDeparts());
-        }else{
+        if (StringUtils.isNotEmpty(materialInfo.getDepartId())) {
+            //departIds = departService.getChildDepartId(BaseContextHandler.getDeparts());
             departIds = departService.getChildDepartId(materialInfo.getDepartId());
             departIds = departService.getChildDepartId(materialInfo.getDepartId());
+        }else{
+            departIds = BaseContextHandler.getDeparts();
         }
         }
         // Page<MaterialInfo> page = new Page<ErpSettlement>(pageNo, pageSize);
         // Page<MaterialInfo> page = new Page<ErpSettlement>(pageNo, pageSize);
         queryWrapper.eq("del_flag","0");
         queryWrapper.eq("del_flag","0");
-        queryWrapper.in("depart_id", JSUtils.quoteEach(departIds,","));
+       // queryWrapper.eq("depart_id",materialInfo.getDepartId());
+        //queryWrapper.in("depart_id", JSUtils.quoteEach(departIds,","));
         if(StringUtils.isNotEmpty(materialInfo.getFacInformationtype())){
         if(StringUtils.isNotEmpty(materialInfo.getFacInformationtype())){
             queryWrapper.eq("fac_informationtype",materialInfo.getFacInformationtype());
             queryWrapper.eq("fac_informationtype",materialInfo.getFacInformationtype());
         }
         }
@@ -188,6 +192,7 @@ public class MaterialInfoController {
         if(StringUtils.isNotEmpty(materialInfo.getStandardsType())){
         if(StringUtils.isNotEmpty(materialInfo.getStandardsType())){
             queryWrapper.eq("standards_type",materialInfo.getStandardsType());
             queryWrapper.eq("standards_type",materialInfo.getStandardsType());
         }
         }
+        queryWrapper.orderByDesc("create_time");
         return queryWrapper;
         return queryWrapper;
     }
     }
 
 
@@ -206,9 +211,10 @@ public class MaterialInfoController {
         Result<MaterialInfo> result = new Result<MaterialInfo>();
         Result<MaterialInfo> result = new Result<MaterialInfo>();
         try {
         try {
             if (StringUtils.isBlank(materialInfo.getDepartId())) {
             if (StringUtils.isBlank(materialInfo.getDepartId())) {
-                String userCode = BaseContextHandler.getUserId();
+                //String userCode = BaseContextHandler.getUserId();
                 //根据用户id查询所属厂区 只要第一个
                 //根据用户id查询所属厂区 只要第一个
-                materialInfo.setDepartId(materialInfoService.queryFacByUserId(userCode));
+                //materialInfo.setDepartId(materialInfoService.queryFacByUserId(userCode));
+                materialInfo.setDepartId(BaseContextHandler.getRealDepartId());
             }
             }
             materialInfoService.save(materialInfo);
             materialInfoService.save(materialInfo);
             result.success("添加成功！");
             result.success("添加成功！");

@@ -41,6 +41,9 @@ public class MaterialInfo {
 	/**删除状态（0，正常，1已删除）*/
 	/**删除状态（0，正常，1已删除）*/
     @ApiModelProperty(value = "删除状态（0，正常，1已删除）")
     @ApiModelProperty(value = "删除状态（0，正常，1已删除）")
 	private String delFlag;
 	private String delFlag;
+
+	@ApiModelProperty(value = "用户编号")
+	private String userId;
 	/**创建人*/
 	/**创建人*/
 	@Excel(name = "创建人", width = 15,dictTable = "sys_user",dicCode = "username",dicText = "realname"  ,orderNum = "6")
 	@Excel(name = "创建人", width = 15,dictTable = "sys_user",dicCode = "username",dicText = "realname"  ,orderNum = "6")
     @ApiModelProperty(value = "创建人" )
     @ApiModelProperty(value = "创建人" )
@@ -56,7 +59,6 @@ public class MaterialInfo {
     @ApiModelProperty(value = "更新人")
     @ApiModelProperty(value = "更新人")
 	private String updateBy;
 	private String updateBy;
 	/**更新时间*/
 	/**更新时间*/
-
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "更新时间")
     @ApiModelProperty(value = "更新时间")