0803

src/main/java/cn/ezhizao/project/business/technologicalProcessDetailDrawing/controller/BizTechnologicalProcessDetailDrawingController.java

@@ -98,6 +98,7 @@ public class BizTechnologicalProcessDetailDrawingController extends BaseControll
 
     @Log(title = "用户管理", businessType = BusinessType.IMPORT)
     @PreAuthorize("@ss.hasPermi('business:workpiece:import')")
+    @Transactional
     @PostMapping("/importData")
     public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception
     {
@@ -130,17 +131,17 @@ public class BizTechnologicalProcessDetailDrawingController extends BaseControll
                 return error(user.getUserId() + "该人员没有个人章");
             }
             String personalSeal = personList.get(0).getUrl().substring("/profile".length());
-
+            BizTechnologicalProcessDetailDrawing getItem = bizTechnologicalProcessDetailDrawingService.query().eq("id",item.getId()).one();
 
 
             String url = "";
-            url = item.getUrl();
+            url = getItem.getUrl();
             url = url.substring("/profile".length());
-            item.setProducerId(user.getUserId());
-            item.setProducer(user.getNickName());
-            item.setStatus(0);
+            getItem.setProducerId(user.getUserId());
+            getItem.setProducer(user.getNickName());
+            getItem.setStatus(0);
 
-            item.setPattern("新产品");
+            getItem.setPattern("新产品");
             //上传调整尺寸
 
 
@@ -148,22 +149,22 @@ public class BizTechnologicalProcessDetailDrawingController extends BaseControll
             bizTechnologicalProcessDetailDrawingService.addText(filePath +url.substring(0, url.length()-4) + "制作" + url.substring(url.length()-4),filePath+url.substring(0, url.length()-4) + "制作人" + url.substring(url.length()-4),"制定人：",550,75,12,270);
             bizTechnologicalProcessDetailDrawingService.addText(filePath +url.substring(0, url.length()-4) + "制作人" + url.substring(url.length()-4),filePath+url.substring(0, url.length()-4) + "制作时间" + url.substring(url.length()-4),formattedDate,500,75,12,270);
             bizTechnologicalProcessDetailDrawingService.addImage(filePath+url.substring(0, url.length()-4) + "制作时间" + url.substring(url.length()-4),filePath+url.substring(0, url.length()-4) + "制作完成" + url.substring(url.length()-4),filePath+personalSeal,515,40,30,30,270,1);
-            item.setUrl("/profile/"+url.substring(0, url.length()-4) + "制作完成" + url.substring(url.length()-4));
-            bizTechnologicalProcessDetailDrawingService.updateById(item);
+            getItem.setUrl("/profile/"+url.substring(0, url.length()-4) + "制作完成" + url.substring(url.length()-4));
+            bizTechnologicalProcessDetailDrawingService.updateById(getItem);
             //添加用户记录
             BizTechnologicalProcessDetailDrawingUser drawingUser = new BizTechnologicalProcessDetailDrawingUser();
-            drawingUser.setDrawingId(item.getId());
-            drawingUser.setProcessCode(item.getProcessCode());
-            drawingUser.setDrawingName(item.getDrawingName());
+            drawingUser.setDrawingId(getItem.getId());
+            drawingUser.setProcessCode(getItem.getProcessCode());
+            drawingUser.setDrawingName(getItem.getDrawingName());
             drawingUser.setType(0);
             drawingUser.setUserId(user.getUserId());
             drawingUser.setNickName(user.getNickName());
-            drawingUser.setProductId(item.getProductId());
-            drawingUser.setProductVersion(item.getProductVersion());
+            drawingUser.setProductId(getItem.getProductId());
+            drawingUser.setProductVersion(getItem.getProductVersion());
             drawingUser.setRecordTime(new Date());
             bizTechnologicalProcessDetailDrawingUserService.save(drawingUser);
             List<BizTechnologicalProcessDetailDrawing>itemList = new ArrayList<>();
-            itemList.add(item);
+            itemList.add(getItem);
             //开始正是走审核流程
             bizTechnologicalProcessDetailDrawingService.saveData(itemList,item.getReviewerCode(),item.getReviewer());
             //批准流程

src/main/resources/mybatis/system/SysUserMapper.xml

@@ -209,12 +209,9 @@
 	<select id="getListByUserName" resultType="cn.ezhizao.project.system.domain.SysUser">
 		select distinct * from sys_user
 		<where>
-			<if test="userName != null and userName != ''">
 				AND user_name =  #{userName}
-			</if>
-			<if test="nickName != null and nickName != ''">
 				AND nick_name = #{nickName}
-			</if>
+
 			and del_flag = 0
 		</where>
 	</select>