diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/service/impl/SmzSspProblemmodifyDraftServiceImpl.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/service/impl/SmzSspProblemmodifyDraftServiceImpl.java
index a9b0e8a9..e755538f 100644
--- a/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/service/impl/SmzSspProblemmodifyDraftServiceImpl.java
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/service/impl/SmzSspProblemmodifyDraftServiceImpl.java
@@ -85,38 +85,9 @@ public class SmzSspProblemmodifyDraftServiceImpl implements ISmzSspProblemmodify
     @Transactional
     public int insertSmzSspProblemmodifyDraft(SmzSspProblemmodifyDraft smzSspProblemmodifyDraft)
     {
-        SysDept sysDept = deptMapper.selectDeptByUserName(smzSspProblemmodifyDraft.getCreateUser());
+
         //当前角色时管理员时，修改角色为集团公司
-        String roleType = "";
-        if(DeptTypeEnum.JTGS.getCode().equals(sysDept.getTypeFlag())){
-            SurProjectUserinfo surProjectUserinfo = new SurProjectUserinfo();
-            surProjectUserinfo.setProjectId(smzSspProblemmodifyDraft.getProjectId());
-            surProjectUserinfo.setCreateBy(smzSspProblemmodifyDraft.getCreateUser());
-            List<SurProjectUserinfo> datalist = surProjectUserinfoMapper.querySurProjectUserinfoByParams(surProjectUserinfo);
-            if(datalist!=null && datalist.size()>0 && datalist.get(0)!=null && PublicStateEnum.USERTYPE_JFJL.getCode().equals(datalist.get(0).getJobType())){
-                //说明是甲方经理
-                roleType = DeptTypeEnum.JFDBTYPE.getCode();
-            }else{
-                roleType = DeptTypeEnum.JTGSTYPE.getCode();
-            }
-        }else if(DeptTypeEnum.ZGS.getCode().equals(sysDept.getTypeFlag())){
-            SurProjectUserinfo surProjectUserinfo = new SurProjectUserinfo();
-            surProjectUserinfo.setProjectId(smzSspProblemmodifyDraft.getProjectId());
-            surProjectUserinfo.setCreateBy(smzSspProblemmodifyDraft.getCreateUser());
-            List<SurProjectUserinfo> datalist = surProjectUserinfoMapper.querySurProjectUserinfoByParams(surProjectUserinfo);
-            if(datalist!=null && datalist.size()>0 && datalist.get(0)!=null && PublicStateEnum.USERTYPE_JFJL.getCode().equals(datalist.get(0).getJobType())){
-                //说明是甲方经理
-                roleType = DeptTypeEnum.JFDBTYPE.getCode();
-            }else{
-                roleType = DeptTypeEnum.ZGSTYPE.getCode();
-            }
-        }else if(DeptTypeEnum.JLDW.getCode().equals(sysDept.getTypeFlag())){
-            roleType = DeptTypeEnum.JLDWTYPE.getCode();
-        }else if(DeptTypeEnum.ZBDW.getCode().equals(sysDept.getTypeFlag())){
-            roleType = DeptTypeEnum.ZBDWTYPE.getCode();
-        }else if(DeptTypeEnum.FBDW.getCode().equals(sysDept.getTypeFlag())){
-            roleType = DeptTypeEnum.FBDWTYPE.getCode();
-        }
+        String roleType = getRoleType(smzSspProblemmodifyDraft.getProjectId(),smzSspProblemmodifyDraft.getCreateUser());
         AtomicInteger count = new AtomicInteger();
         for(List<String> urls:smzSspProblemmodifyDraft.getFileUrls()){
             SmzSspProblemmodifyDraft insert = new SmzSspProblemmodifyDraft();
@@ -148,8 +119,13 @@ public class SmzSspProblemmodifyDraftServiceImpl implements ISmzSspProblemmodify
     public int batchUpdateSmzSspProblemmodifyDraft(List<SmzSspProblemmodify> smzSspProblemmodifyList) {
         int res = 0;
         for(SmzSspProblemmodify smzSspProblemmodify:smzSspProblemmodifyList){
-            //删除草稿
-            smzSspProblemmodifyDraftMapper.deleteSmzSspProblemmodifyDraftById(smzSspProblemmodify.getId());
+            if(smzSspProblemmodify.getId()!=null){
+                //删除草稿
+                smzSspProblemmodifyDraftMapper.deleteSmzSspProblemmodifyDraftById(smzSspProblemmodify.getId());
+            }
+            if(smzSspProblemmodify.getRoleType()==null || smzSspProblemmodify.getRoleType()<1){
+                smzSspProblemmodify.setRoleType(Convert.toInt(getRoleType(smzSspProblemmodify.getProjectId(),smzSspProblemmodify.getCreateUser())));
+            }
             //设置主图
             smzSspProblemmodify.setMarksPicture(smzSspProblemmodify.getSmarkUrl().split(",")[0]);
             smzSspProblemmodifyMapper.insertSmzSspProblemmodify(smzSspProblemmodify);
@@ -165,6 +141,47 @@ public class SmzSspProblemmodifyDraftServiceImpl implements ISmzSspProblemmodify
         return res;
     }
 
+    /**
+     * 查询用户类型
+     * @param projectId
+     * @param createUser
+     * @return
+     */
+    private String getRoleType(Long projectId, String createUser){
+        SysDept sysDept = deptMapper.selectDeptByUserName(createUser);
+        String roleType = "";
+        if(DeptTypeEnum.JTGS.getCode().equals(sysDept.getTypeFlag())){
+            SurProjectUserinfo surProjectUserinfo = new SurProjectUserinfo();
+            surProjectUserinfo.setProjectId(projectId);
+            surProjectUserinfo.setCreateBy(createUser);
+            List<SurProjectUserinfo> datalist = surProjectUserinfoMapper.querySurProjectUserinfoByParams(surProjectUserinfo);
+            if(datalist!=null && datalist.size()>0 && datalist.get(0)!=null && PublicStateEnum.USERTYPE_JFJL.getCode().equals(datalist.get(0).getJobType())){
+                //说明是甲方经理
+                roleType = DeptTypeEnum.JFDBTYPE.getCode();
+            }else{
+                roleType = DeptTypeEnum.JTGSTYPE.getCode();
+            }
+        }else if(DeptTypeEnum.ZGS.getCode().equals(sysDept.getTypeFlag())){
+            SurProjectUserinfo surProjectUserinfo = new SurProjectUserinfo();
+            surProjectUserinfo.setProjectId(projectId);
+            surProjectUserinfo.setCreateBy(createUser);
+            List<SurProjectUserinfo> datalist = surProjectUserinfoMapper.querySurProjectUserinfoByParams(surProjectUserinfo);
+            if(datalist!=null && datalist.size()>0 && datalist.get(0)!=null && PublicStateEnum.USERTYPE_JFJL.getCode().equals(datalist.get(0).getJobType())){
+                //说明是甲方经理
+                roleType = DeptTypeEnum.JFDBTYPE.getCode();
+            }else{
+                roleType = DeptTypeEnum.ZGSTYPE.getCode();
+            }
+        }else if(DeptTypeEnum.JLDW.getCode().equals(sysDept.getTypeFlag())){
+            roleType = DeptTypeEnum.JLDWTYPE.getCode();
+        }else if(DeptTypeEnum.ZBDW.getCode().equals(sysDept.getTypeFlag())){
+            roleType = DeptTypeEnum.ZBDWTYPE.getCode();
+        }else if(DeptTypeEnum.FBDW.getCode().equals(sysDept.getTypeFlag())){
+            roleType = DeptTypeEnum.FBDWTYPE.getCode();
+        }
+        return roleType;
+    }
+
     /**
      * 修改随手拍问题整改质量留痕信息
      *