Merge branch 'developer' of http://115.159.76.241/haoban3.0/haoban-manage3.0.git into developer

haoban-manage3-operation-web/src/main/java/com/gic/haoban/manage/web/errCode/HaoBanErrCode.java

@@ -69,7 +69,7 @@ public enum HaoBanErrCode {
     ERR_10005(10005,"成员已存在"),
     ERR_10006(10006,"字典key已存在"),
     ERR_10007(10007,"字典名称已存在"),
-
+    ERR_10008(10008,"title已存在"),
 
     ERR_DEFINE(-888, "自定义错误"),
     ERR_OTHER(-999, "未知错误code");

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/HelpApiServiceImpl.java

@@ -20,6 +20,7 @@ import com.gic.haoban.manage.service.entity.TabHaobanDict;
 import com.gic.haoban.manage.service.entity.TabHaobanHelp;
 import com.github.pagehelper.PageHelper;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -35,6 +36,11 @@ public class HelpApiServiceImpl implements HelpApiService{
 			//空，则新增
 			dto.setHelpId(UuidUtil.randomUUID());
 			TabHaobanHelp tab = EntityUtil.changeEntity(TabHaobanHelp.class, dto);
+			tab.setStatusFlag(1);
+			tab.setCreateTime(new Date());
+			tab.setUpdateTime(new Date());
+			tab.setOpenFlag(1);
+			tab.setSort(1);
 			TabHaobanHelp tab1 = tabHaobanHelpMapper.selectByHelpTitle(dto.getHelpTitle());
 			if(tab1!=null){
 				return 8;
@@ -42,6 +48,7 @@ public class HelpApiServiceImpl implements HelpApiService{
 			tabHaobanHelpMapper.insert(tab);
 		}else{
 			TabHaobanHelp tab = EntityUtil.changeEntity(TabHaobanHelp.class, dto);
+			tab.setUpdateTime(new Date());
 			tabHaobanHelpMapper.updateByPrimaryKeySelective(tab);
 		}	
 		return 1;

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/StaffController.java

@@ -217,7 +217,7 @@ public class StaffController extends WebBaseController{
 			staffVO.setStaffName(clerk.getClerkName());
 			staffVO.setNationCode(clerk.getNationcode());
 			staffVO.setPhoneNumber(clerk.getPhoneNumber());
-			staffVO.setPostion(clerk.getPositionName());
+			staffVO.setPosition(clerk.getPositionName());
 			staffVO.setHeadImg(clerk.getHeadImgUrl());
 			staffVO.setDepartmentName(storeDTO==null?"":storeDTO.getStoreName());
 		}
@@ -234,7 +234,7 @@ public class StaffController extends WebBaseController{
 			staffVO.setStaffName(staff.getStaffName());
 			staffVO.setNationCode(staff.getNationCode());
 			staffVO.setPhoneNumber(staff.getPhoneNumber());
-			staffVO.setPostion(staff.getPostion());
+			staffVO.setPosition(staff.getPostion());
 			staffVO.setHeadImg(staff.getHeadImg());
 			if(CollectionUtil.isNotEmpty(list)){
 				String departmentId = list.get(0).getDepartmentId();

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/vo/StaffVO.java

@@ -17,7 +17,7 @@ public class StaffVO implements Serializable{
 
 	private String nationCode;
 
-	private String postion;
+	private String position;
 
 	private String departmentName;
 
@@ -55,12 +55,13 @@ public class StaffVO implements Serializable{
 		this.nationCode = nationCode;
 	}
 
-	public String getPostion() {
-		return postion;
+
+	public String getPosition() {
+		return position;
 	}
 
-	public void setPostion(String postion) {
-		this.postion = postion;
+	public void setPosition(String position) {
+		this.position = position;
 	}
 
 	public String getDepartmentName() {